diff --git a/.github/workflows/manualrun.yml b/.github/workflows/manualrun.yml new file mode 100644 index 0000000000..974de01a30 --- /dev/null +++ b/.github/workflows/manualrun.yml @@ -0,0 +1,12 @@ +name: Release Drafter + +on: repository_dispatch + +jobs: + update_draft_release: + runs-on: ubuntu-latest + + steps: + - uses: ThatGamerBlue/release-drafter@v5.7.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 98dbb3cc0b..dd7c52b6f8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,19 +29,19 @@ import org.ajoberstar.grgit.Grgit buildscript { repositories { gradlePluginPortal() - mavenLocal() + maven(url = "https://repo.openosrs.com/repository/maven/") maven(url = "https://raw.githubusercontent.com/open-osrs/hosting/master") } dependencies { classpath("org.ajoberstar.grgit:grgit-core:4.0.2") - classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") - classpath("com.openosrs:injector-plugin:1.1.2") + classpath("com.github.ben-manes:gradle-versions-plugin:0.29.0") + classpath("com.openosrs:injector-plugin:1.1.5") } } plugins { - id("com.adarshr.test-logger") version "2.0.0" apply false - id("com.github.ben-manes.versions") version "0.28.0" + id("com.adarshr.test-logger") version "2.1.0" apply false + id("com.github.ben-manes.versions") version "0.29.0" id("se.patrikerdes.use-latest-versions") version "0.2.14" id("org.ajoberstar.grgit") version "4.0.2" id("com.simonharrer.modernizer") version "2.1.0-1" apply false @@ -169,6 +169,13 @@ subprojects { withSourcesJar() } + withType { + isPreserveFileTimestamps = false + isReproducibleFileOrder = true + dirMode = 493 + fileMode = 420 + } + withType { options.encoding = "UTF-8" } @@ -195,6 +202,8 @@ subprojects { } } } + + configurations["compileOnly"].extendsFrom(configurations["annotationProcessor"]) } application { diff --git a/buildSrc/src/main/kotlin/BootstrapPlugin.kt b/buildSrc/src/main/kotlin/BootstrapPlugin.kt index c704cddb30..33509f96e5 100644 --- a/buildSrc/src/main/kotlin/BootstrapPlugin.kt +++ b/buildSrc/src/main/kotlin/BootstrapPlugin.kt @@ -15,6 +15,7 @@ class BootstrapPlugin : Plugin { bootstrapDependencies(project(":runescape-api")) bootstrapDependencies(project(":http-api")) bootstrapDependencies(project(":injected-client")) + bootstrapDependencies(project(":runelite-client")) } tasks.register("bootstrapStaging", "staging") diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index f366565479..c6f46b6c4e 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -25,9 +25,9 @@ object ProjectVersions { const val launcherVersion = "2.2.0" - const val rlVersion = "1.6.21" + const val rlVersion = "1.6.24" - const val openosrsVersion = "3.3.9" + const val openosrsVersion = "3.4.2" const val rsversion = 190 const val cacheversion = 165 diff --git a/cache/cache.gradle.kts b/cache/cache.gradle.kts index b294d55f53..cb2879ed36 100644 --- a/cache/cache.gradle.kts +++ b/cache/cache.gradle.kts @@ -41,7 +41,8 @@ dependencies { implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "29.0-jre") implementation(group = "commons-cli", name = "commons-cli", version = "1.4") - implementation(group = "io.netty", name = "netty-buffer", version = "4.1.50.Final") + implementation(group = "io.netty", name = "netty-buffer", version = "4.1.51.Final") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.8.0") implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.8-1") implementation(group = "org.apache.commons", name = "commons-compress", version = "1.20") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") diff --git a/cache/src/main/java/net/runelite/cache/definitions/HealthBarDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/HealthBarDefinition.java index 970d9e8745..3d37861ecf 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/HealthBarDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/HealthBarDefinition.java @@ -31,13 +31,13 @@ public class HealthBarDefinition { public int id; public int field3276; - public int field3277; - public int field3278; - public int field3283; - public int field3272; - public int field3275; - public int healthBarFrontSpriteId; - public int healthBarBackSpriteId; - public int healthScale; - public int healthBarPadding; + public int field3277 = 255; + public int field3278 = 255; + public int field3283 = -1; + public int field3272 = 1; + public int field3275 = 70; + public int healthBarFrontSpriteId = -1; + public int healthBarBackSpriteId = -1; + public int healthScale = 30; + public int healthBarPadding = 0; } 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 a15e25a868..2dc3176678 100644 --- a/cache/src/main/java/net/runelite/cache/region/RegionLoader.java +++ b/cache/src/main/java/net/runelite/cache/region/RegionLoader.java @@ -98,9 +98,10 @@ public class RegionLoader Region region = new Region(i); region.loadTerrain(mapDef); - int[] keys = keyManager.getKeys(i); - if (keys != null) + Integer[] keysTmp = keyManager.getKeys(i); + if (keysTmp != null) { + int[] keys = {keysTmp[0], keysTmp[1], keysTmp[2], keysTmp[3]}; try { data = land.decompress(storage.loadArchive(land), keys); 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 468ab487f3..769c4be24a 100644 --- a/cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java +++ b/cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java @@ -24,8 +24,11 @@ */ package net.runelite.cache.util; +import java.io.IOException; import java.util.HashMap; import java.util.Map; +import net.runelite.http.api.RuneLiteAPI; +import net.runelite.http.api.xtea.XteaClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,14 +36,25 @@ public class XteaKeyManager { private static final Logger logger = LoggerFactory.getLogger(XteaKeyManager.class); - private final Map keys = new HashMap<>(); + private Map keys = new HashMap<>(); public void loadKeys() { + XteaClient xteaClient = new XteaClient(RuneLiteAPI.CLIENT); + try + { + keys = xteaClient.get(); + } + catch (IOException e) + { + e.printStackTrace(); + } + + logger.info("Loaded {} keys", keys.size()); } - public int[] getKeys(int region) + public Integer[] getKeys(int region) { return keys.get(region); } diff --git a/cache/src/test/java/net/runelite/cache/MapDumperTest.java b/cache/src/test/java/net/runelite/cache/MapDumperTest.java index 8d1fffd7cb..6f4df04948 100644 --- a/cache/src/test/java/net/runelite/cache/MapDumperTest.java +++ b/cache/src/test/java/net/runelite/cache/MapDumperTest.java @@ -76,7 +76,7 @@ public class MapDumperTest for (int i = 0; i < MAX_REGIONS; i++) { - int[] keys = keyManager.getKeys(i); + Integer[] keysTmp = keyManager.getKeys(i); int x = i >> 8; int y = i & 0xFF; @@ -95,8 +95,9 @@ public class MapDumperTest Files.write(data, new File(outDir, "m" + x + "_" + y + ".dat")); - if (keys != null) + if (keysTmp != null) { + int[] keys = {keysTmp[0], keysTmp[1], keysTmp[2], keysTmp[3]}; try { data = land.decompress(storage.loadArchive(land), keys); @@ -142,9 +143,10 @@ public class MapDumperTest MapDefinition mapDef = new MapLoader().load(x, y, data); LocationsDefinition locDef = null; - int[] keys = keyManager.getKeys(i); - if (keys != null) + Integer[] keysTmp = keyManager.getKeys(i); + if (keysTmp != null) { + int[] keys = {keysTmp[0], keysTmp[1], keysTmp[2], keysTmp[3]}; try { data = land.decompress(storage.loadArchive(land), keys); diff --git a/deobfuscator/deobfuscator.gradle.kts b/deobfuscator/deobfuscator.gradle.kts index d19897359f..58af1ba65b 100644 --- a/deobfuscator/deobfuscator.gradle.kts +++ b/deobfuscator/deobfuscator.gradle.kts @@ -35,7 +35,9 @@ dependencies { deobjars(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString()) deobjars(project(":runescape-client")) - implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") + + implementation(group = "org.jetbrains", name = "annotations", version = "20.0.0") implementation(group = "org.ow2.asm", name = "asm", version = "8.0.1") implementation(group = "org.ow2.asm", name = "asm-util", version = "8.0.1") implementation(group = "net.runelite", name = "fernflower", version = "07082019") @@ -49,7 +51,7 @@ dependencies { testImplementation(deobjars) testImplementation(group = "junit", name = "junit", version = "4.13") - testImplementation(group = "org.mockito", name = "mockito-core", version = "3.3.3") + testImplementation(group = "org.mockito", name = "mockito-core", version = "3.4.6") } tasks { @@ -90,7 +92,7 @@ tasks { filter(ReplaceTokens::class, "tokens" to tokens) filteringCharset = "UTF-8" } - + // TODO: Enable assertions on all 3 register("Downloader.main()") { group = "gamepack" @@ -103,6 +105,7 @@ tasks { classpath = project.sourceSets.main.get().runtimeClasspath main = "net.runelite.deob.Deob" + args = listOf(tokens["vanilla.jar"], "$buildDir/libs/deobfuscated-$version.jar") } register("UpdateMappings.main()") { diff --git a/deobfuscator/src/main/java/net/runelite/asm/Annotated.java b/deobfuscator/src/main/java/net/runelite/asm/Annotated.java deleted file mode 100644 index 4645fa23a2..0000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/Annotated.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.runelite.asm; - -import java.util.Iterator; -import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import org.jetbrains.annotations.NotNull; - -public interface Annotated extends Iterable -{ - Annotations getAnnotations(); - - @NotNull - default Iterator iterator() - { - return getAnnotations().iterator(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/Annotation.java b/deobfuscator/src/main/java/net/runelite/asm/Annotation.java new file mode 100644 index 0000000000..6c9e4ff23b --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/asm/Annotation.java @@ -0,0 +1,217 @@ +/* + * Copyright (c) 2020, Lucas + * 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; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import org.jetbrains.annotations.NotNull; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Opcodes; + +/** + * Note: this class has a natural ordering that is inconsistent with equals. + */ +public class Annotation extends AnnotationVisitor implements Comparable +{ + /** + * Name:Value pairs in this annotation. Uses a tree map to make order reproducible. + * + * Data can be any of the following: + * - Primitive values + * - Strings + * - Class objects + * - Enum constants (not implemented) + * - Arrays of any of the above (use {@link ArrayList} + * - Other Annotations + */ + private final TreeMap data = new TreeMap<>(); + private final Type type; + /** + * Unused for now but here for easy implementation later if anyone wants to + */ + private final boolean visible; + + public Annotation(Type type) + { + this(type, true); + } + + public Annotation(Type type, Object val) + { + this(type); + this.setElement(val); + } + + public Annotation(Type type, boolean visible) + { + super(Opcodes.ASM5); + this.type = type; + this.visible = visible; + } + + public Type getType() + { + return type; + } + + public void addElement(String name, Object value) + { + if (data.put(name, value) != null) + throw new IllegalStateException("The annotation already contains a value mapped to " + name); + } + + public void addElement(Object value) + { + addElement("value", value); + } + + public void setElement(String name, Object value) + { + data.put(name, value); + } + + public void setElement(Object value) + { + setElement("value", value); + } + + public Object remove(String name) + { + return data.remove(name); + } + + public Object get(String name) + { + return data.get(name); + } + + public Object getValue() + { + return get("value"); + } + + public String getValueString() + { + return (String) getValue(); + } + + public int size() + { + return data.size(); + } + + @Override + public void visit(String name, Object value) + { + data.put(name, value); + } + + @Override + public AnnotationVisitor visitAnnotation(String name, String descriptor) + { + final var annotation = new Annotation(new Type(descriptor)); + data.put(name, annotation); + return annotation; + } + + @Override + public AnnotationVisitor visitArray(String name) + { + final var lst = new ArrayList<>(); + data.put(name, lst); + return new AnnotationVisitor(Opcodes.ASM5) + { + @Override + public void visit(String name, Object value) + { + lst.add(value); + } + @Override + public AnnotationVisitor visitAnnotation(String name, String descriptor) + { + Annotation annotation = new Annotation(new Type(descriptor)); + lst.add(annotation); + return annotation; + } + }; + } + + public void accept(AnnotationVisitor visitor) + { + if (visitor == null) + return; + + for (var entry : data.entrySet()) + accept(visitor, entry.getKey(), entry.getValue()); + + visitor.visitEnd(); + } + + private static void accept(AnnotationVisitor visitor, final String name, final Object value) + { + if (visitor == null) + return; + + if (value instanceof Annotation) + { + Annotation annotation = (Annotation) value; + annotation.accept(visitor.visitAnnotation(name, annotation.getType().toString())); + } + else if (value instanceof List) + { + AnnotationVisitor arr = visitor.visitArray(name); + List arrayValue = (List) value; + + for (Object o : arrayValue) + { + accept(arr, null, o); + } + + arr.visitEnd(); + } + else + { + visitor.visit(name, value); + } + } + + @Override + public int compareTo(@NotNull Annotation that) + { + return this.type.toString().compareTo(that.type.toString()); + } + + @Override + public String toString() + { + StringBuilder str = new StringBuilder('@' + type.toAsmString().replace('/', '.') + '('); + for (Map.Entry e : data.entrySet()) + str.append(e.getKey()).append('=').append(e.getValue().toString()); + str.append(')'); + return str.toString(); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/asm/ClassFile.java b/deobfuscator/src/main/java/net/runelite/asm/ClassFile.java index fd2ba5a40a..2ab59c53bf 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/ClassFile.java +++ b/deobfuscator/src/main/java/net/runelite/asm/ClassFile.java @@ -25,9 +25,11 @@ package net.runelite.asm; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; -import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; +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.*; @@ -51,14 +53,14 @@ public class ClassFile implements Annotated, Named private final Interfaces interfaces; private final List fields = new ArrayList<>(); private final List methods = new ArrayList<>(); - private final Annotations annotations; + @Getter + private final Map annotations = new LinkedHashMap<>(); public ClassFile(ClassGroup group) { this.group = group; interfaces = new Interfaces(this); - annotations = new Annotations(); } public ClassFile() @@ -99,7 +101,7 @@ public class ClassFile implements Annotated, Named visitor.visit(version, access, name.getName(), null, super_class.getName(), ints); visitor.visitSource(source, null); - for (Annotation annotation : annotations) + for (Annotation annotation : annotations.values()) { annotation.accept(visitor.visitAnnotation(annotation.getType().toString(), true)); } @@ -170,11 +172,6 @@ public class ClassFile implements Annotated, Named methods.remove(method); } - public Annotations getAnnotations() - { - return annotations; - } - public String getName() { return name.getName(); @@ -312,7 +309,7 @@ public class ClassFile implements Annotated, Named for (Method m : methods) { if (m.isStatic() && - name.equals(getObfuscatedName(m.getAnnotations())) && + name.equals(getObfuscatedName(m)) && type.equals(getObfuscatedSignature(m))) { return m; diff --git a/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java b/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java index fabde88742..3b29c295b6 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java +++ b/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java @@ -151,7 +151,7 @@ public class ClassGroup implements Iterable { for (ClassFile cf : classes) { - if (name.equals(getObfuscatedName(cf.getAnnotations()))) + if (name.equals(getObfuscatedName(cf))) { return cf; } diff --git a/deobfuscator/src/main/java/net/runelite/asm/Field.java b/deobfuscator/src/main/java/net/runelite/asm/Field.java index 1a9fd7a776..33c4f84488 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Field.java +++ b/deobfuscator/src/main/java/net/runelite/asm/Field.java @@ -24,8 +24,10 @@ */ package net.runelite.asm; -import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; +import java.util.LinkedHashMap; +import java.util.Map; +import lombok.Getter; +import net.runelite.asm.attributes.Annotated; import net.runelite.deob.DeobAnnotations; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Opcodes; @@ -43,20 +45,19 @@ public class Field implements Annotated, Named private String name; private Type type; private Object value; // ConstantValue - private final Annotations annotations; + @Getter + private final Map annotations = new LinkedHashMap<>(); public Field(ClassFile classFile, String name, Type type) { this.classFile = classFile; this.name = name; this.type = type; - - this.annotations = new Annotations(); } public void accept(FieldVisitor visitor) { - for (Annotation annotation : annotations.getAnnotations()) + for (Annotation annotation : annotations.values()) { annotation.accept(visitor.visitAnnotation(annotation.getType().toString(), true)); } @@ -150,15 +151,10 @@ public class Field implements Annotated, Named this.value = value; } - public Annotations getAnnotations() - { - return annotations; - } - public net.runelite.asm.pool.Field getPoolField() { return new net.runelite.asm.pool.Field( - new net.runelite.asm.pool.Class(classFile.getName()), + classFile.getPoolClass(), this.getName(), this.getType() ); diff --git a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java b/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java index 9bc15d5100..180417b3f6 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java +++ b/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java @@ -98,7 +98,7 @@ public class Interfaces implements Iterable final List names = new ArrayList<>(); for (ClassFile c : getMyInterfaces()) { - String name = DeobAnnotations.getObfuscatedName(c.getAnnotations()); + String name = DeobAnnotations.getObfuscatedName(c); if (name == null) { continue; diff --git a/deobfuscator/src/main/java/net/runelite/asm/Method.java b/deobfuscator/src/main/java/net/runelite/asm/Method.java index b13e98aa3f..e1c711fdf9 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/Method.java +++ b/deobfuscator/src/main/java/net/runelite/asm/Method.java @@ -25,11 +25,13 @@ package net.runelite.asm; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; -import net.runelite.asm.attributes.Annotations; +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.annotation.Annotation; import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.LocalVariable; import net.runelite.asm.attributes.code.Parameter; @@ -55,8 +57,9 @@ public class Method implements Annotated, Named private int accessFlags; private String name; private Signature arguments; - private Exceptions exceptions; - private Annotations annotations; + private final Exceptions exceptions; + @Getter + private final Map annotations = new LinkedHashMap<>(); private List parameters; private Code code; @@ -66,7 +69,6 @@ public class Method implements Annotated, Named this.name = name; this.arguments = signature; exceptions = new Exceptions(); - annotations = new Annotations(); parameters = new ArrayList<>(); } @@ -89,7 +91,7 @@ public class Method implements Annotated, Named visitor.visitParameter(p.getName(), p.getAccess()); } - for (Annotation annotation : annotations.getAnnotations()) + for (Annotation annotation : annotations.values()) { annotation.accept(visitor.visitAnnotation(annotation.getType().toString(), true)); } @@ -277,11 +279,6 @@ public class Method implements Annotated, Named this.code = code; } - public Annotations getAnnotations() - { - return annotations; - } - @SuppressWarnings("unchecked") public List findLVTInstructionsForVariable(int index) { @@ -313,7 +310,7 @@ public class Method implements Annotated, Named public net.runelite.asm.pool.Method getPoolMethod() { return new net.runelite.asm.pool.Method( - new net.runelite.asm.pool.Class(classFile.getName()), + classFile.getPoolClass(), name, arguments ); diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotated.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotated.java new file mode 100644 index 0000000000..bb43361049 --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotated.java @@ -0,0 +1,51 @@ +package net.runelite.asm.attributes; + +import java.util.Map; +import net.runelite.asm.Annotation; +import net.runelite.asm.Type; + +/** + * Objects implementing this only have to implement getAnnotations. + */ +public interface Annotated +{ + Map getAnnotations(); + + default Annotation findAnnotation(Type type, boolean createNew) + { + if (createNew) + return getAnnotations().computeIfAbsent(type, Annotation::new); + else + return getAnnotations().get(type); + } + + default Annotation findAnnotation(Type type) + { + return findAnnotation(type, false); + } + + default void addAnnotation(Annotation annotation) + { + if (getAnnotations().put(annotation.getType(), annotation) != null) + throw new IllegalStateException("Annotation with type " + annotation.getType() + " already exists"); + } + + default void addAnnotation(Type type) + { + if (getAnnotations().put(type, new Annotation(type)) != null) + throw new IllegalStateException("Annotation with type " + type + " already exists"); + } + + default void addAnnotation(Type type, Object val) + { + getAnnotations().put(type, new Annotation(type, val)); + } + + default void addAnnotation(Type type, String key, Object val) + { + final var a = new Annotation(type); + a.setElement(key, val); + if (getAnnotations().put(type, a) != null) + throw new IllegalStateException("Annotation with type " + type + " already exists"); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java deleted file mode 100644 index 6e184a89ec..0000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/Annotations.java +++ /dev/null @@ -1,91 +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; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import net.runelite.asm.Type; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; -import net.runelite.asm.attributes.annotation.SimpleElement; -import org.jetbrains.annotations.NotNull; - -public class Annotations implements Iterable -{ - private final List annotations = new ArrayList<>(); - - public List getAnnotations() - { - return annotations; - } - - public void addAnnotation(Annotation annotation) - { - annotations.add(annotation); - } - - public void removeAnnotation(Annotation annotation) - { - annotations.remove(annotation); - } - - public void clearAnnotations() - { - annotations.clear(); - } - - public Annotation find(Type type) - { - for (Annotation a : annotations) - if (a.getType().equals(type)) - return a; - return null; - } - - public int size() - { - return annotations.size(); - } - - public Annotation addAnnotation(Type type, String name, Object value) - { - Annotation annotation = new Annotation(type); - addAnnotation(annotation); - - Element element = new SimpleElement(name, value); - annotation.addElement(element); - - return annotation; - } - - @NotNull - @Override - public Iterator iterator() - { - return this.annotations.iterator(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java deleted file mode 100644 index 6f3a459eb3..0000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Annotation.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.asm.attributes.annotation; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import net.runelite.asm.Type; -import org.jetbrains.annotations.NotNull; -import org.objectweb.asm.AnnotationVisitor; - -public class Annotation extends Element> implements Iterable -{ - private final Type type; - - public Annotation(Type type) - { - this.value = new ArrayList<>(); - this.type = type; - } - - public Annotation(String name, Type type) - { - this.value = new ArrayList<>(); - this.name = name; - this.type = type; - } - - public Type getType() - { - return type; - } - - public List getElements() - { - return value; - } - - public Element getElement() - { - return value.get(0); - } - - public void addElement(Element element) - { - value.add(element); - } - - @Override - public final void setValue(List value) - { - throw new UnsupportedOperationException(); - } - - public void accept(AnnotationVisitor visitor) - { - if (visitor == null) - { - return; - } - - for (Element element : this) - { - accept(visitor, element.name, element.value); - } - - visitor.visitEnd(); - } - - @NotNull - @Override - public Iterator iterator() - { - return this.value.iterator(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/ArrayElement.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/ArrayElement.java deleted file mode 100644 index b7e2b7ef84..0000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/ArrayElement.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.runelite.asm.attributes.annotation; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Stream; -import org.jetbrains.annotations.NotNull; - -public class ArrayElement extends Element implements Iterable -{ - public ArrayElement(String name) - { - this.name = name; - this.value = new ArrayList<>(); - } - - @SuppressWarnings("unchecked") - public void addValue(Object value) - { - this.value.add(value); - } - - @Override - public final void setValue(List value) - { - throw new UnsupportedOperationException(); - } - - @NotNull - @Override - @SuppressWarnings("unchecked") - public Iterator iterator() - { - return this.value.iterator(); - } - - @SuppressWarnings("unchecked") - public Stream stream() - { - return this.value.stream(); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/SimpleElement.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/SimpleElement.java deleted file mode 100644 index 52e25e295c..0000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/SimpleElement.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.runelite.asm.attributes.annotation; - -public class SimpleElement extends Element -{ - public SimpleElement(Object value) - { - this.value = value; - } - - public SimpleElement(String name, Object value) - { - this.name = name; - this.value = value; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java b/deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java index 6e19232d51..5c6f2f9e7f 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java +++ b/deobfuscator/src/main/java/net/runelite/asm/execution/Execution.java @@ -204,6 +204,18 @@ public class Execution this.addFrame(f); } + public void addMethods(Iterable methods) + { + for (Method m : methods) + { + if (m.getCode() == null) + continue; + Frame f = new Frame(this, m); + f.initialize(); + this.addFrame(f); + } + } + public void run() { assert !paused; diff --git a/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java b/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java index 58b56deb2f..8fd9e88252 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java +++ b/deobfuscator/src/main/java/net/runelite/asm/signature/Signature.java @@ -28,20 +28,17 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Objects; -import java.util.regex.Matcher; import java.util.regex.Pattern; import net.runelite.asm.Type; public class Signature { - private static Pattern paramRetPattern = Pattern.compile("\\((.*)\\)(.*)"), - paramsPattern = Pattern.compile("(\\[*(?:B|C|Z|S|I|J|F|D|(?:L[^;]*;)))"); + private static final Pattern RLAPITORSAPI = Pattern.compile("net/runelite/(rs/)?api/(RS)?"); private final List arguments; private final Type rv; - private Signature(List arguments, Type rv) + public Signature(List arguments, Type rv) { this.arguments = new ArrayList<>(arguments); this.rv = rv; @@ -49,23 +46,12 @@ public class Signature public Signature(String str) { - Matcher m = paramRetPattern.matcher(str); - if (!m.find()) - { - throw new IllegalArgumentException("Signature has no arguments"); - } + final int rvStart = str.indexOf(')'); + if (rvStart == -1) + throw new IllegalArgumentException("Descriptor has no return value!"); - String args = m.group(1), ret = m.group(2); - - m = paramsPattern.matcher(args); - arguments = new ArrayList<>(); - while (m.find()) - { - String arg = m.group(1); - arguments.add(new Type(arg)); - } - - rv = new Type(ret); + rv = new Type(str.substring(rvStart + 1)); + arguments = findArgs(str, new ArrayList<>(), str.indexOf('(') + 1, rvStart); } public Signature(Signature other) @@ -74,6 +60,21 @@ public class Signature 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) { @@ -82,17 +83,13 @@ public class Signature return false; } - Signature a = (Signature) other; - return arguments.equals(a.arguments) && rv.equals(a.rv); + return this.toString().equals(other.toString()); } @Override public int hashCode() { - int hash = 5; - hash = 97 * hash + Objects.hashCode(this.arguments); - hash = 97 * hash + Objects.hashCode(this.rv); - return hash; + return this.toString().hashCode(); } @Override @@ -176,6 +173,6 @@ public class Signature public Signature rsApiToRsClient() { - return new Signature(this.toString().replaceAll("net/runelite/(rs/)?api/(RS)?", "")); + return new Signature(RLAPITORSAPI.matcher(this.toString()).replaceAll("")); } } diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/AnnotationElementVisitor.java b/deobfuscator/src/main/java/net/runelite/asm/visitors/AnnotationElementVisitor.java deleted file mode 100644 index 7bd5811813..0000000000 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/AnnotationElementVisitor.java +++ /dev/null @@ -1,83 +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.visitors; - -import net.runelite.asm.Type; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.ArrayElement; -import net.runelite.asm.attributes.annotation.SimpleElement; -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.Opcodes; - -public class AnnotationElementVisitor extends AnnotationVisitor -{ - private final Annotation annotation; - - AnnotationElementVisitor(Annotation annotation) - { - super(Opcodes.ASM5); - - this.annotation = annotation; - } - - @Override - public void visit(String name, Object value) - { - SimpleElement element = new SimpleElement(name, value); - annotation.addElement(element); - } - - @Override - public AnnotationVisitor visitArray(String name) - { - ArrayElement element = new ArrayElement(name); - this.annotation.addElement(element); - return new AnnotationVisitor(Opcodes.ASM5) - { - @Override - public void visit(String name, Object value) - { - element.addValue(value); - } - - @Override - public AnnotationVisitor visitAnnotation(String name, String descriptor) - { - Annotation annotation = new Annotation(name, new Type(descriptor)); - element.addValue(annotation); - return new AnnotationElementVisitor(annotation); - } - }; - } - - @Override - public AnnotationVisitor visitAnnotation(String name, String descriptor) - { - Annotation annotation = new Annotation(name, new Type(descriptor)); - this.annotation.addElement(annotation); - return new AnnotationElementVisitor(annotation); - } -} diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java b/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java index c9012b162c..b84c4b1090 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java +++ b/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFieldVisitor.java @@ -27,7 +27,7 @@ package net.runelite.asm.visitors; import net.runelite.asm.ClassFile; import net.runelite.asm.Field; import net.runelite.asm.Type; -import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.Annotation; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Attribute; import org.objectweb.asm.FieldVisitor; @@ -51,9 +51,9 @@ public class ClassFieldVisitor extends FieldVisitor @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - Annotation element = new Annotation(new Type(desc)); - this.field.getAnnotations().addAnnotation(element); - return new AnnotationElementVisitor(element); + Annotation annotation = new Annotation(new Type(desc), visible); + this.field.addAnnotation(annotation); + return annotation; } @Override diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java b/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java index d96ec550b1..a7efe37fb9 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java +++ b/deobfuscator/src/main/java/net/runelite/asm/visitors/ClassFileVisitor.java @@ -27,7 +27,7 @@ package net.runelite.asm.visitors; import net.runelite.asm.ClassFile; import net.runelite.asm.Type; -import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.Annotation; import net.runelite.asm.signature.Signature; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassVisitor; @@ -71,9 +71,8 @@ public class ClassFileVisitor extends ClassVisitor public AnnotationVisitor visitAnnotation(String desc, boolean visible) { Annotation annotation = new Annotation(new Type(desc)); - classFile.getAnnotations().addAnnotation(annotation); - - return new AnnotationElementVisitor(annotation); + classFile.addAnnotation(annotation); + return annotation; } @Override diff --git a/deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java b/deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java index 7746cd7a7a..f4846facf2 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java +++ b/deobfuscator/src/main/java/net/runelite/asm/visitors/CodeVisitor.java @@ -32,7 +32,7 @@ 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.annotation.Annotation; +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; @@ -108,9 +108,9 @@ public class CodeVisitor extends MethodVisitor @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - Annotation element = new Annotation(new Type(desc)); - this.method.getAnnotations().addAnnotation(element); - return new AnnotationElementVisitor(element); + Annotation annotation = new Annotation(new Type(desc), visible); + this.method.addAnnotation(annotation); + return annotation; } @Override diff --git a/deobfuscator/src/main/java/net/runelite/deob/Deob.java b/deobfuscator/src/main/java/net/runelite/deob/Deob.java index 70a5ec7d88..ebe8aca6df 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/Deob.java +++ b/deobfuscator/src/main/java/net/runelite/deob/Deob.java @@ -37,7 +37,6 @@ 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.StaticShouldBeInstance; import net.runelite.deob.deobfuscators.UnreachedCode; import net.runelite.deob.deobfuscators.UnusedClass; import net.runelite.deob.deobfuscators.UnusedFields; @@ -80,68 +79,63 @@ public class Deob ClassGroup group = JarUtil.loadJar(new File(args[0])); - run(group, new StaticShouldBeInstance()); + // remove except RuntimeException + run(group, new RuntimeExceptions()); - if (args.length <= 2 || !args[2].equals("rl")) - { - // remove except RuntimeException - run(group, new RuntimeExceptions()); + run(group, new ControlFlowDeobfuscator()); - run(group, new ControlFlowDeobfuscator()); + run(group, new RenameUnique()); - 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 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 illegal state exceptions, frees up some parameters - run(group, new IllegalStateExceptions()); + // remove constant logically dead parameters + run(group, new ConstantParameter()); - // remove constant logically dead parameters - run(group, new ConstantParameter()); + // remove unhit blocks + run(group, new UnreachedCode()); + run(group, new UnusedMethods()); - // remove unhit blocks - run(group, new UnreachedCode()); - run(group, new UnusedMethods()); + // remove unused parameters + run(group, new UnusedParameters()); - // remove unused parameters - run(group, new UnusedParameters()); + // remove unused fields + run(group, new UnusedFields()); - // remove unused fields - run(group, new UnusedFields()); + run(group, new FieldInliner()); - run(group, new FieldInliner()); + // order uses class name order for sorting fields/methods, + // so run it before removing classes below + run(group, new Order()); - // order uses class name order for sorting fields/methods, - // so run it before removing classes below - run(group, new Order()); + run(group, new UnusedClass()); - run(group, new UnusedClass()); + runMath(group); - runMath(group); + run(group, new ExprArgOrder()); - run(group, new ExprArgOrder()); + run(group, new Lvt()); - run(group, new Lvt()); + run(group, new CastNull()); - run(group, new CastNull()); + run(group, new EnumDeobfuscator()); - run(group, new EnumDeobfuscator()); + new OpcodesTransformer().transform(group); + //run(group, new PacketHandlerOrder()); + //run(group, new PacketWriteDeobfuscator()); - new OpcodesTransformer().transform(group); - //run(group, new PacketHandlerOrder()); - //run(group, new PacketWriteDeobfuscator()); + run(group, new MenuActionDeobfuscator()); - run(group, new MenuActionDeobfuscator()); - - new GetPathTransformer().transform(group); - new ClientErrorTransformer().transform(group); - new ReflectionTransformer().transform(group); - //new MaxMemoryTransformer().transform(group); - //new RuneliteBufferTransformer().transform(group); - } + new GetPathTransformer().transform(group); + new ClientErrorTransformer().transform(group); + new ReflectionTransformer().transform(group); + //new MaxMemoryTransformer().transform(group); + //new RuneliteBufferTransformer().transform(group); JarUtil.saveJar(group, new File(args[1])); diff --git a/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java b/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java index d5e83313da..f2ee7438c4 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java +++ b/deobfuscator/src/main/java/net/runelite/deob/DeobAnnotations.java @@ -24,15 +24,15 @@ */ package net.runelite.deob; -import java.util.List; +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.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.Annotation; import net.runelite.asm.signature.Signature; +import org.jetbrains.annotations.NotNull; public class DeobAnnotations { @@ -41,98 +41,77 @@ public class DeobAnnotations public static final Type IMPLEMENTS = new Type("Lnet/runelite/mapping/Implements;"); public static final Type OBFUSCATED_GETTER = new Type("Lnet/runelite/mapping/ObfuscatedGetter;"); public static final Type OBFUSCATED_SIGNATURE = new Type("Lnet/runelite/mapping/ObfuscatedSignature;"); - public static final Type HOOK = new Type("Lnet/runelite/mapping/Hook;"); public static Signature getObfuscatedSignature(Method m) { - String str = getAnnotationValue(m.getAnnotations(), OBFUSCATED_SIGNATURE); + Object val = get(m, OBFUSCATED_SIGNATURE, "descriptor"); - if (str == null) - { + if (val == null) return null; - } - return new Signature(str); + return new Signature((String) val); } public static Type getObfuscatedType(Field f) { - String str = getAnnotationValue(f.getAnnotations(), OBFUSCATED_SIGNATURE); + Object val = get(f, OBFUSCATED_SIGNATURE, "descriptor"); - if (str == null) - { + if (val == null) return null; - } - return new Type(str); + return new Type((String) val); } - public static String getObfuscatedName(Annotations an) + @Nullable + public static String getObfuscatedName(@NotNull Annotated an) { - return getAnnotationValue(an, OBFUSCATED_NAME); + return getStringValue(an, OBFUSCATED_NAME); } - public static String getExportedName(Annotations an) + @Nullable + public static String getExportedName(@NotNull Annotated an) { - return getAnnotationValue(an, EXPORT); + return getStringValue(an, EXPORT); } - public static String getImplements(ClassFile cf) + @Nullable + public static String getImplements(@NotNull ClassFile cf) { - return getAnnotationValue(cf.getAnnotations(), IMPLEMENTS); + return getStringValue(cf, IMPLEMENTS); } - public static Number getObfuscatedGetter(Field field) + @Nullable + public static Number getObfuscatedGetter(@NotNull Field field) { - if (field == null || field.getAnnotations() == null) - { - return null; - } - - Annotation an = field.getAnnotations().find(OBFUSCATED_GETTER); - if (an == null) - { - return null; - } - - return (Number) an.getElement().getValue(); - } - - public static String getDecoder(Method method) - { - if (method == null || method.getAnnotations() == null) - { - return null; - } - - Annotation an = method.getAnnotations().find(OBFUSCATED_SIGNATURE); - if (an == null) - { - return null; - } - - List elements = an.getElements(); - if (elements == null || elements.size() < 2) - { - return null; - } - - return (String) elements.get(1).getValue(); - } - - public static String getAnnotationValue(Annotations an, Type type) - { - if (an == null) - { - return null; - } - - Annotation a = an.find(type); + final var a = field.findAnnotation(OBFUSCATED_GETTER); if (a == null) - { return null; - } - return a.getElement().getString(); + if (field.getType().equals(Type.INT)) + return (Integer) a.get("intValue"); + if (field.getType().equals(Type.LONG)) + return (Long) a.get("longValue"); // very long v + throw new IllegalArgumentException("Field with getter but not a long or an int?"); + } + + @Nullable + public static String getDecoder(@NotNull Method method) + { + Annotation a = method.findAnnotation(OBFUSCATED_SIGNATURE); + return a == null ? null : (String) a.get("garbageValue"); + } + + @Nullable + public static Object get(Annotated an, Type type, String name) + { + final var a = an.findAnnotation(type); + return a == null ? null : a.get(name); + } + + @Nullable + public static String getStringValue(Annotated an, Type type) + { + final var a = an.findAnnotation(type); + return a == null ? null : a.getValueString(); } } diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java index 093fb705c6..70573d2630 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Order.java @@ -24,7 +24,6 @@ */ package net.runelite.deob.deobfuscators; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,7 +31,7 @@ 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.Annotations; +import net.runelite.asm.attributes.Annotated; import net.runelite.asm.execution.Execution; import net.runelite.deob.DeobAnnotations; import net.runelite.deob.Deobfuscator; @@ -64,7 +63,7 @@ public class Order implements Deobfuscator for (int i = 0; i < group.getClasses().size(); i++) { ClassFile cf = group.getClasses().get(i); - String className = DeobAnnotations.getObfuscatedName(cf.getAnnotations()); + String className = DeobAnnotations.getObfuscatedName(cf); nameIndices.put(className, i); } @@ -73,7 +72,7 @@ public class Order implements Deobfuscator for (ClassFile cf : group.getClasses()) { List m = cf.getMethods(); - Collections.sort(m, this::compareMethod); + m.sort(this::compare); sortedMethods += m.size(); @@ -81,7 +80,7 @@ public class Order implements Deobfuscator if (!cf.isEnum()) { List f = cf.getFields(); - Collections.sort(f, this::compareFields); + f.sort(this::compare); sortedFields += f.size(); } @@ -91,47 +90,27 @@ public class Order implements Deobfuscator } // static fields, member fields, clinit, init, methods, static methods - private int compareMethod(Method m1, Method m2) + private int compare(Annotated a, Annotated b) { - int i1 = getType(m1), i2 = getType(m2); + int i1 = getType(a), i2 = getType(b); if (i1 != i2) { return Integer.compare(i1, i2); } - int nameIdx1 = getNameIdx(m1.getAnnotations()); - int nameIdx2 = getNameIdx(m2.getAnnotations()); + int nameIdx1 = getNameIdx(a); + int nameIdx2 = getNameIdx(b); if (nameIdx1 != nameIdx2) { return Integer.compare(nameIdx1, nameIdx2); } - return compareOrder(m1, m2); + return compareOrder(a, b); } - private int compareFields(Field f1, Field f2) - { - int i1 = getType(f1), i2 = getType(f2); - - if (i1 != i2) - { - return Integer.compare(i1, i2); - } - - int nameIdx1 = getNameIdx(f1.getAnnotations()); - int nameIdx2 = getNameIdx(f2.getAnnotations()); - - if (nameIdx1 != nameIdx2) - { - return Integer.compare(nameIdx1, nameIdx2); - } - - return compareOrder(f1, f2); - } - - private int getNameIdx(Annotations annotations) + private int getNameIdx(Annotated annotations) { String name = DeobAnnotations.getObfuscatedName(annotations); @@ -140,6 +119,15 @@ public class Order implements Deobfuscator 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("")) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java index 694c59edf6..56b74051d8 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/PacketHandlerOrder.java @@ -151,7 +151,7 @@ public class PacketHandlerOrder implements Deobfuscator // check if the invoke is on buffer/packetbuffer classes boolean matches = ii.getMethods().stream() .filter(m -> m.getDescriptor().size() == 0) - .map(method -> method.getClassFile()) + .map(Method::getClassFile) .anyMatch(cf -> cf == bf.getBuffer() || cf == bf.getPacketBuffer()); if (matches) { @@ -269,7 +269,7 @@ public class PacketHandlerOrder implements Deobfuscator logger.warn("Unable to differentiate {} from {}", p1, p2); return 0; }) - .map(s -> s.clone()) + .map(PacketHandler::clone) .collect(Collectors.toList()); assert sortedHandlers.size() == handlers.getHandlers().size(); @@ -277,7 +277,7 @@ public class PacketHandlerOrder implements Deobfuscator for (PacketHandler handler : sortedHandlers) { handler.sortedReads = new ArrayList<>(handler.reads); - Collections.sort(handler.sortedReads, (PacketRead p1, PacketRead p2) -> + handler.sortedReads.sort((PacketRead p1, PacketRead p2) -> { LVTInstruction l1 = (LVTInstruction) p1.getStore(); LVTInstruction l2 = (LVTInstruction) p2.getStore(); @@ -350,7 +350,7 @@ public class PacketHandlerOrder implements Deobfuscator // Find unique methods List methods = unsortedHandlers.stream() - .map(ph -> ph.getMethod()) + .map(PacketHandler::getMethod) .distinct() .collect(Collectors.toList()); @@ -439,10 +439,6 @@ public class PacketHandlerOrder implements Deobfuscator } List follow = follow(instructions, handler.getStart(), afterRead); - if (follow == null) - { - continue; - } for (Instruction i : follow) { @@ -559,11 +555,11 @@ public class PacketHandlerOrder implements Deobfuscator private int compareReads(List r1, List r2) { List t1 = r1.stream() - .map(pr -> pr.getType()) + .map(PacketRead::getType) .sorted(this::compareType) .collect(Collectors.toList()); List t2 = r2.stream() - .map(pr -> pr.getType()) + .map(PacketRead::getType) .sorted(this::compareType) .collect(Collectors.toList()); if (t1.size() != t2.size()) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java index 06c6e905ea..ad792c5570 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java @@ -38,50 +38,33 @@ import net.runelite.deob.util.NameMappings; public class RenameUnique implements Deobfuscator { - private Renamer renamer; - private void generateClassNames(NameMappings map, ClassGroup group) { int i = 0; - for (ClassFile cf : group.getClasses()) - { - if (cf.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN) - { - continue; - } - - map.map(cf.getPoolClass(), "class" + i++); - } + 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.getAnnotations()))) - { - continue; - } - - map.map(field.getPoolField(), "field" + i++); - } + 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.getAnnotations()))) - { + if (!Deob.isObfuscated(method.getName()) || method.getName().equals(DeobAnnotations.getExportedName(method))) continue; - } List virtualMethods = VirtualMethods.getVirtualMethods(method); assert !virtualMethods.isEmpty(); @@ -95,6 +78,7 @@ public class RenameUnique implements Deobfuscator for (Method m : virtualMethods) map.map(m.getPoolMethod(), name); } + map.setMethods(i); } @Override @@ -109,7 +93,7 @@ public class RenameUnique implements Deobfuscator this.generateFieldNames(mappings, group); this.generateMethodNames(mappings, group); - renamer = new Renamer(mappings); + 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 index 588b840918..94e858745e 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java @@ -31,9 +31,10 @@ 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.annotation.Annotation; import net.runelite.asm.attributes.code.Exceptions; import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.LocalVariable; @@ -45,6 +46,8 @@ import net.runelite.deob.Deobfuscator; import net.runelite.deob.util.NameMappings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static net.runelite.deob.DeobAnnotations.OBFUSCATED_NAME; +import static net.runelite.deob.DeobAnnotations.OBFUSCATED_SIGNATURE; public class Renamer implements Deobfuscator { @@ -134,12 +137,7 @@ public class Renamer implements Deobfuscator if (!method.getDescriptor().equals(newSignature)) { - //Signature was updated. Annotate it - if (method.getAnnotations().find(DeobAnnotations.OBFUSCATED_SIGNATURE) == null) - { - //Signature was not previously renamed - method.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE, "signature", method.getDescriptor().toString()); - } + method.findAnnotation(OBFUSCATED_SIGNATURE, true).setElement( "descriptor", method.getDescriptor().toString()); } method.setDescriptor(newSignature); @@ -156,21 +154,13 @@ public class Renamer implements Deobfuscator { if (field.getType().getInternalName().equals(cf.getName())) { - if (field.getAnnotations().find(DeobAnnotations.OBFUSCATED_SIGNATURE) == null) - { - //Signature was updated. Annotate it - field.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE, "signature", field.getType().toString()); - } - + field.findAnnotation(OBFUSCATED_SIGNATURE, true).setElement("descriptor", field.getType().toString()); field.setType(Type.getType("L" + name + ";", field.getType().getDimensions())); } } } - if (cf.getAnnotations().find(DeobAnnotations.OBFUSCATED_NAME) == null) - { - cf.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_NAME, "value", cf.getName()); - } + addObfuscatedName(cf); group.renameClass(cf, name); } @@ -178,22 +168,13 @@ public class Renamer implements Deobfuscator private void regeneratePool(ClassGroup group) { for (ClassFile cf : group.getClasses()) - { for (Method m : cf.getMethods()) - { - Code c = m.getCode(); - if (c == null) - { - continue; - } - - c.getInstructions().regeneratePool(); - } - } + if (m.getCode() != null) + m.getCode().getInstructions() + .regeneratePool(); } @Override - @SuppressWarnings("unchecked") public void run(ClassGroup group) { group.buildClassGraph(); @@ -212,12 +193,9 @@ public class Renamer implements Deobfuscator continue; } - if (field.getAnnotations().find(DeobAnnotations.OBFUSCATED_NAME) == null) - { - field.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_NAME, "value", field.getName()); - } + addObfuscatedName(field); - assert DeobAnnotations.getExportedName(field.getAnnotations()) == null || DeobAnnotations.getExportedName(field.getAnnotations()).equals(newName) : "Tried changing field name to something other than the exported name!"; + 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; @@ -232,15 +210,6 @@ public class Renamer implements Deobfuscator String newName = mappings.get(method.getPoolMethod()); String[] newParams = mappings.getP(method.getPoolMethod()); - // rename on obfuscated signature - Annotation an = method.getAnnotations().find(DeobAnnotations.OBFUSCATED_SIGNATURE); - if (an != null) - { - Signature obfuscatedSig = new Signature(an.getElement().getString()); - Signature updatedSig = renameSignature(obfuscatedSig); - an.getElement().setValue(updatedSig.toString()); - } - if (newName == null) { continue; @@ -279,10 +248,7 @@ public class Renamer implements Deobfuscator ++parameters; } - if (m.getAnnotations().find(DeobAnnotations.OBFUSCATED_NAME) == null) - { - m.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_NAME, "value", m.getName()); - } + addObfuscatedName(m); m.setName(newName); } @@ -308,35 +274,8 @@ public class Renamer implements Deobfuscator logger.info("Renamed {} classes, {} fields, {} methods, and {} parameters", classes, fields, methods, parameters); } - private Type renameType(Type t) + private static void addObfuscatedName(T object) { - if (t.isPrimitive()) - { - return t; - } - - String className = t.getInternalName(); - String newName = mappings.get(new net.runelite.asm.pool.Class(className)); - if (newName == null) - { - return t; - } - - Type type = Type.getType("L" + newName + ";", t.getDimensions()); - - logger.debug("Renamed {} -> {}", t, type); - - return type; - } - - private Signature renameSignature(Signature s) - { - Signature.Builder builder = new Signature.Builder() - .setReturnType(renameType(s.getReturnValue())); - for (Type t : s.getArguments()) - { - builder.addArgument(renameType(t)); - } - return builder.build(); + object.findAnnotation(OBFUSCATED_NAME, true).setElement(object.getName()); } } diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/StaticShouldBeInstance.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/StaticShouldBeInstance.java deleted file mode 100644 index 1cae903698..0000000000 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/StaticShouldBeInstance.java +++ /dev/null @@ -1,171 +0,0 @@ -package net.runelite.deob.deobfuscators; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -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.Type; -import net.runelite.asm.attributes.Annotations; -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.ReturnInstruction; -import net.runelite.asm.attributes.code.instructions.InvokeStatic; -import net.runelite.asm.attributes.code.instructions.InvokeVirtual; -import net.runelite.asm.pool.Method; -import net.runelite.asm.signature.Signature; -import net.runelite.deob.Deobfuscator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class StaticShouldBeInstance implements Deobfuscator -{ - private static final Logger logger = LoggerFactory.getLogger(StaticShouldBeInstance.class); - private static Map methods = new HashMap<>(); - - public void run(ClassGroup group) - { - int replacedCalls = 0; - int removedInstructions = 0; - int removedMethods = 0; - int removedAnnotations = 0; - List obfuscatedMethods = new ArrayList<>(); - - for (ClassFile cf : group.getClasses()) - { - // Remove unused annotations - Annotations a = cf.getAnnotations(); - removedAnnotations += a.getAnnotations().size(); - a.clearAnnotations(); - - Type type = new Type('L' + cf.getClassName() + ';'); - obfuscatedMethods.clear(); - - for (net.runelite.asm.Method m : cf.getMethods()) - { - // Remove unused annotations - a = m.getAnnotations(); - removedAnnotations += a.size(); - a.clearAnnotations(); - - if (m.isStatic() && m.getCode() != null) - { - if (checkIfObf(m, type, cf)) - { - removedMethods++; - obfuscatedMethods.add(m); - } - } - } - - - for (net.runelite.asm.Method m : obfuscatedMethods) - { - Signature sig = m.getDescriptor(); - Signature.Builder builder = new Signature.Builder(); - builder.setReturnType(sig.getReturnValue()); - if (sig.getArguments().size() > 1) - { - builder.addArguments(sig.getArguments().subList(1, sig.getArguments().size())); - } - - Signature toFind = builder.build(); - - net.runelite.asm.Method notStatic = cf.findMethod(m.getName(), toFind); - net.runelite.asm.pool.Method oldPool = m.getPoolMethod(); - cf.removeMethod(notStatic); - - m.setDescriptor(toFind); - m.setStatic(false); - Code c = m.getCode(); - Instructions ins = c.getInstructions(); - int startLength = ins.getInstructions().size(); - ListIterator it = ins.getInstructions().listIterator(); - assert it.hasNext(); - Instruction i = it.next(); - while (!(i instanceof ReturnInstruction)) - { - it.remove(); - i = it.next(); - } - it.remove(); - net.runelite.asm.pool.Method newPool = m.getPoolMethod(); - - methods.put(oldPool, newPool); - - removedInstructions += startLength - ins.getInstructions().size(); - } - - for (Field fi : cf.getFields()) - { - a = fi.getAnnotations(); - if (a.find(new Type("Ljavax/inject/Inject;")) == null) - { - removedAnnotations += a.size(); - a.clearAnnotations(); - } - else - { - logger.info("Class {}, field {} has inject", cf.getClassName(), fi.getName()); - } - } - } - - for (ClassFile cf : group.getClasses()) - { - for (net.runelite.asm.Method m : cf.getMethods()) - { - if (m.getCode() == null) - { - continue; - } - - Instructions ins = m.getCode().getInstructions(); - List instructions = ins.getInstructions(); - for (int i1 = 0, instructionsSize = instructions.size(); i1 < instructionsSize; i1++) - { - Instruction i = instructions.get(i1); - if (!(i instanceof InvokeStatic)) - { - continue; - } - - if (methods.containsKey(((InvokeStatic) i).getMethod())) - { - InvokeVirtual invoke = new InvokeVirtual(ins, methods.get(((InvokeStatic) i).getMethod())); - ins.replace(i, invoke); - replacedCalls++; - } - } - } - } - - logger.info("Made {} methods not static, removed {} instructions, replaced {} invokes, and removed {} annotations", removedMethods, removedInstructions, replacedCalls, removedAnnotations); - } - - private static boolean checkIfObf(net.runelite.asm.Method m, Type type, ClassFile cf) - { - Signature sig = m.getDescriptor(); - if (sig.getArguments().size() < 1 || !sig.getTypeOfArg(0).equals(type)) - { - return false; - } - - Signature.Builder builder = new Signature.Builder(); - builder.setReturnType(sig.getReturnValue()); - if (sig.getArguments().size() > 1) - { - builder.addArguments(sig.getArguments().subList(1, sig.getArguments().size())); - } - - Signature toFind = builder.build(); - - net.runelite.asm.Method notStatic = cf.findMethod(m.getName(), toFind); - - return notStatic != null; - } -} diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java index ed9f086bc5..8f34cc4b6b 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java @@ -97,22 +97,22 @@ public class UnusedParameters implements Deobfuscator private boolean shouldRemove(Method m, int parameter) { - Signature obSig = DeobAnnotations.getObfuscatedSignature(m); - if (obSig == null) - { + final var a = m.findAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE); + if (a == null) return false; - } + final var str = a.get("descriptor"); - return parameter + 1 == obSig.size(); + return parameter + 1 == new Signature((String) str).size(); } private int processUnused(Execution execution, ClassGroup group) { int count = 0; - for (List m : unused.keySet()) + for (Map.Entry, Collection> entry : unused.entrySet()) { - Collection u = unused.get(m); + List m = entry.getKey(); + Collection u = entry.getValue(); int offset = m.size() == 1 && m.get(0).isStatic() ? 0 : 1; @@ -188,7 +188,7 @@ public class UnusedParameters implements Deobfuscator } } - List l = new ArrayList<>(list); + List l = new ArrayList<>(list != null ? list : new ArrayList<>()); // i know Collections.sort(l); Collections.reverse(l); return l; @@ -218,7 +218,7 @@ public class UnusedParameters implements Deobfuscator InvokeInstruction ii = (InvokeInstruction) i; - if (!ii.getMethods().stream().anyMatch(me -> methods.contains(me))) + if (ii.getMethods().stream().noneMatch(methods::contains)) { continue; } @@ -227,20 +227,17 @@ public class UnusedParameters implements Deobfuscator Collection ics = invokes.get(i); assert ics != null; - if (ics != null) + for (InstructionContext ins : ics) { - 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) { - 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 + continue; } + + ins.removeStack(pops); // remove parameter from stack } } } @@ -286,25 +283,20 @@ public class UnusedParameters implements Deobfuscator public void run(ClassGroup group) { int i; - int pnum = 1; - do - { - group.buildClassGraph(); - invokes.clear(); - this.buildUnused(group); + group.buildClassGraph(); - Execution execution = new Execution(group); - execution.addExecutionVisitor(ictx -> visit(ictx)); - execution.populateInitialMethods(); - execution.run(); + invokes.clear(); + this.buildUnused(group); - i = this.processUnused(execution, group); + Execution execution = new Execution(group); + execution.addExecutionVisitor(this::visit); + execution.populateInitialMethods(); + execution.run(); - count += i; - break; - } - while (i > 0); + i = this.processUnused(execution, group); + + count += i; logger.info("Removed {} unused parameters", count); } 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 index f9d99a380e..17e9b8c974 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java @@ -783,7 +783,7 @@ public class ModArith implements Deobfuscator String ename = pair.getType() == Long.class ? "longValue" : "intValue"; - f.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_GETTER, ename, pair.getter); + f.addAnnotation(DeobAnnotations.OBFUSCATED_GETTER, ename, pair.getter); } } } 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 index 8acc41a172..c40355c29d 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java @@ -26,8 +26,13 @@ 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; @@ -36,64 +41,44 @@ public class Block /** * blocks which jump here */ - private final List prev = new ArrayList<>(); + private final List preds = new ArrayList<>(); /** * blocks which this jumps to */ - private final List next = new ArrayList<>(); + private final List succs = new ArrayList<>(); /** * block which flows directly into this block */ - private Block flowsFrom; + private Block pred; /** * block which this directly flows into */ - private Block flowsInto; + private Block succ; /** * instructions in this block */ private final List instructions = new ArrayList<>(); - public int getId() - { - return id; - } - - public void setId(int id) - { - this.id = id; - } - - public boolean isJumptarget() - { - return jumptarget; - } - - public void setJumptarget(boolean jumptarget) - { - this.jumptarget = jumptarget; - } - @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("Block ID ").append(id).append("\n"); - if (flowsFrom != null) + if (pred != null) { - sb.append(" flows from ").append(flowsFrom.id).append("\n"); + sb.append(" flows from ").append(pred.id).append("\n"); } for (Instruction i : instructions) { sb.append(" ").append(i.toString()).append("\n"); } - if (flowsInto != null) + if (succ != null) { - sb.append(" flows into ").append(flowsInto.id).append("\n"); + sb.append(" flows into ").append(succ.id).append("\n"); } sb.append("\n"); return sb.toString(); @@ -111,54 +96,37 @@ public class Block instructions.add(i); } - public List getInstructions() - { - return instructions; - } - public void addPrev(Block block) { - if (!prev.contains(block)) + if (!preds.contains(block)) { - prev.add(block); + preds.add(block); } } - public List getPrev() - { - return prev; - } - public void addNext(Block block) { - if (!next.contains(block)) + if (!succs.contains(block)) { - next.add(block); + succs.add(block); } } - public List getNext() + static int compare(Block a, Block b) { - return next; + final int l1 = a.getLineNumber(); + final int l2 = b.getLineNumber(); + if (l1 == l2 || l1 == -1 || l2 == -1) + return 0; + return Integer.compare(l1, l2); } - public Block getFlowsFrom() + private int getLineNumber() { - return flowsFrom; - } - - public void setFlowsFrom(Block flowsFrom) - { - this.flowsFrom = flowsFrom; - } - - public Block getFlowsInto() - { - return flowsInto; - } - - public void setFlowsInto(Block flowsInto) - { - this.flowsInto = flowsInto; + 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 index 337205400a..285d81d277 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java @@ -24,16 +24,11 @@ */ package net.runelite.deob.deobfuscators.cfg; -import java.util.ArrayList; import java.util.List; -import java.util.PriorityQueue; -import java.util.Queue; 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.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; @@ -64,7 +59,6 @@ public class ControlFlowDeobfuscator implements Deobfuscator continue; } - split(code); run(code); runJumpLabel(code); } @@ -74,167 +68,49 @@ public class ControlFlowDeobfuscator implements Deobfuscator insertedJump, placedBlocks, removedJumps, insertedJump - removedJumps); } - /** - * Add gotos at the end of blocks without terminal instructions - * - * @param code - */ - private void split(Code code) - { - Instructions ins = code.getInstructions(); - Exceptions exceptions = code.getExceptions(); - - ControlFlowGraph graph = new ControlFlowGraph.Builder().build(code); - - List exc = new ArrayList<>(exceptions.getExceptions()); - - exceptions.clear(); // Must clear this before ins.clear() runs - ins.clear(); - - // insert jumps where blocks flow into others - for (Block block : graph.getBlocks()) - { - if (block.getFlowsInto() == null) - { - continue; - } - - Block into = block.getFlowsInto(); - assert into.getFlowsFrom() == block; - - Instruction first = into.getInstructions().get(0); - Label label; - if (!(first instanceof Label)) - { - label = new Label(null); - into.addInstruction(0, label); - } - else - { - label = (Label) first; - } - - Goto g = new Goto(null, label); - block.addInstruction(g); - - block.setFlowsInto(null); - into.setFlowsFrom(null); - - ++insertedJump; - } - - // Readd instructions from modified blocks - for (Block block : graph.getBlocks()) - { - for (Instruction i : block.getInstructions()) - { - assert i.getInstructions() == null; - i.setInstructions(ins); // I shouldn't have to do this here - ins.addInstruction(i); - } - } - - // Readd exceptions - for (Exception ex : exc) - { - exceptions.add(ex); - } - } - - private int compareBlock(Block o1, Block o2) - { - // higher numbers have the lowest priority - if (o1.isJumptarget() && !o2.isJumptarget()) - { - return -1; - } - if (o2.isJumptarget() && !o1.isJumptarget()) - { - return 1; - } - - return 0; - } - private void run(Code code) { Instructions ins = code.getInstructions(); - Exceptions exceptions = code.getExceptions(); - ControlFlowGraph graph = new ControlFlowGraph.Builder().build(code); - - for (Block block : graph.getBlocks()) - { - assert block.getFlowsFrom() == null; - assert block.getFlowsInto() == null; - } + ControlFlowGraph graph = new ControlFlowGraph(code); if (logger.isDebugEnabled()) // graph.toString() is expensive { logger.debug(graph.toString()); } - List originalExceptions = new ArrayList<>(exceptions.getExceptions()); - - // Clear existing exceptions and instructions as we are going to - // rebuild them - exceptions.clear(); + // Clear existing instructions as we are going to rebuild them ins.clear(); - - List done = new ArrayList<>(); - Queue queue = new PriorityQueue<>(this::compareBlock); - - // add initial code block - queue.add(graph.getHead()); - - while (!queue.isEmpty()) + final List sorted = graph.topologicalSort(); + for (Block b : sorted) { - Block block = queue.remove(); - - if (done.contains(block)) - { - continue; - } - - done.add(block); ++placedBlocks; - - logger.debug("Placed block {}", block.getId()); - - List next = block.getNext(); - - if (next.isEmpty() == false) + for (Instruction i : b.getInstructions()) { - // jumps are added in order their instructions are reached by ControlFlowGraph, - // so the last jump is the goto. - // - // removing this line causes the priority queue (due to implementation detail on how - // it handles objects with equal priority) to try to optimize for block closeness - // (how close blocks which are neighbors are to each other in bytecode). - // I get a jump delta of ~+14k with this on 143, vs ~-47k when priotiziing optimizing - // out jumps. I can't tell which is better. - next.get(next.size() - 1).setJumptarget(true); - } - - // add next reachable blocks - for (Block bl : next) - { - queue.add(bl); - } - - for (Instruction i : block.getInstructions()) - { - assert i.getInstructions() == null; - i.setInstructions(ins); // I shouldn't have to do this here 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 - * - * @param code */ private void runJumpLabel(Code code) { 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 index 9347e520ad..a7456a29b1 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java @@ -26,9 +26,12 @@ 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; @@ -36,10 +39,90 @@ import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; public class ControlFlowGraph { - private Map blocks = new HashMap<>(); - private List allBlocks = new ArrayList<>(); + 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; @@ -70,91 +153,4 @@ public class ControlFlowGraph { return head; } - - public static class Builder - { - private final Map blocks = new HashMap<>(); - private final List allBlocks = new ArrayList<>(); - - public ControlFlowGraph build(Code code) - { - int id = 0; - - Block head = new Block(), - cur = head; - allBlocks.add(head); - - for (Instruction i : code.getInstructions().getInstructions()) - { - if (i instanceof Label) - { - // blocks always begin at labels, so create initial blocks - Block block = new Block(); - blocks.put((Label) i, block); - allBlocks.add(block); - } - } - - for (Instruction i : code.getInstructions().getInstructions()) - { - if (i instanceof Label) - { - Block next = blocks.get((Label) i); - assert next != null; - - 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.getFlowsFrom() == null; - assert cur.getFlowsInto() == null; - - // previous block flows directly into next - next.setFlowsFrom(cur); - cur.setFlowsInto(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 != null : "no instructions in code"; - assert head.getFlowsFrom() == null; - - ControlFlowGraph cfg = new ControlFlowGraph(head); - cfg.blocks = blocks; - cfg.allBlocks = allBlocks; - return cfg; - } - } } 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 index b2a0c369b3..c994d37c5d 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantParameter.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/constparam/ConstantParameter.java @@ -34,10 +34,7 @@ import java.util.List; import java.util.Map; import net.runelite.asm.ClassGroup; import net.runelite.asm.Method; -import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; -import net.runelite.asm.attributes.annotation.SimpleElement; +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; @@ -62,8 +59,8 @@ public class ConstantParameter implements Deobfuscator { private static final Logger logger = LoggerFactory.getLogger(ConstantParameter.class); - private Map parameters = new HashMap<>(); - private Multimap mparams = HashMultimap.create(); + private final Map parameters = new HashMap<>(); + private final Multimap mparams = HashMultimap.create(); private void checkMethodsAreConsistent(List methods) { @@ -436,23 +433,18 @@ public class ConstantParameter implements Deobfuscator { Object value = parameter.values.get(0); - Annotations annotations = m.getAnnotations(); - - Annotation obfuscatedSignature = annotations.find(DeobAnnotations.OBFUSCATED_SIGNATURE); - if (obfuscatedSignature != null && obfuscatedSignature.getElements().size() == 2) + Annotation obfuscatedSignature = m.findAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE, true); + if (obfuscatedSignature.size() == 2) { // already annotated continue; } - - if (obfuscatedSignature == null) + else if (obfuscatedSignature.size() == 0) { - obfuscatedSignature = annotations.addAnnotation(DeobAnnotations.OBFUSCATED_SIGNATURE, "signature", m.getDescriptor().toString()); + obfuscatedSignature.setElement("descriptor", m.getDescriptor().toString()); } - // Add garbage value - Element element = new SimpleElement("garbageValue", value.toString()); - obfuscatedSignature.addElement(element); + obfuscatedSignature.setElement("garbageValue", String.valueOf(value)); } } diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java index c837f178ea..c86b66e34e 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationIntegrityChecker.java @@ -30,8 +30,6 @@ 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.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; import net.runelite.deob.DeobAnnotations; import net.runelite.mapping.Import; import net.runelite.rs.api.RSClient; @@ -65,11 +63,6 @@ public class AnnotationIntegrityChecker return errors; } - public int getWarnings() - { - return warnings; - } - public void run() { for (ClassFile cf : one.getClasses()) @@ -97,11 +90,11 @@ public class AnnotationIntegrityChecker if (f1.isStatic()) { - f2 = findExportedFieldStatic(two, DeobAnnotations.getExportedName(f1.getAnnotations())); + f2 = findExportedFieldStatic(two, DeobAnnotations.getExportedName(f1)); } else { - f2 = findExportedField(other, DeobAnnotations.getExportedName(f1.getAnnotations())); + f2 = findExportedField(other, DeobAnnotations.getExportedName(f1)); } if (f2 == null) @@ -110,7 +103,7 @@ public class AnnotationIntegrityChecker { logger.error("Missing IMPORTED field on {} named {}", other, - DeobAnnotations.getExportedName(f1.getAnnotations())); + DeobAnnotations.getExportedName(f1)); ++errors; } @@ -118,7 +111,7 @@ public class AnnotationIntegrityChecker { logger.warn("Missing exported field on {} named {}", other, - DeobAnnotations.getExportedName(f1.getAnnotations())); + DeobAnnotations.getExportedName(f1)); ++warnings; } @@ -143,11 +136,11 @@ public class AnnotationIntegrityChecker if (m1.isStatic()) { - m2 = findExportedMethodStatic(two, DeobAnnotations.getExportedName(m1.getAnnotations())); + m2 = findExportedMethodStatic(two, DeobAnnotations.getExportedName(m1)); } else { - m2 = findExportedMethod(other, DeobAnnotations.getExportedName(m1.getAnnotations())); + m2 = findExportedMethod(other, DeobAnnotations.getExportedName(m1)); } if (m2 == null) @@ -156,7 +149,7 @@ public class AnnotationIntegrityChecker { logger.error("Missing IMPORTED method on {} named {} ({})", other, - DeobAnnotations.getExportedName(m1.getAnnotations()), + DeobAnnotations.getExportedName(m1), m1); ++errors; @@ -165,7 +158,7 @@ public class AnnotationIntegrityChecker { logger.warn("Missing exported method on {} named {} ({})", other, - DeobAnnotations.getExportedName(m1.getAnnotations()), + DeobAnnotations.getExportedName(m1), m1); ++warnings; @@ -173,36 +166,6 @@ public class AnnotationIntegrityChecker } } } - - checkAnnotationCounts(); - } - - private void checkAnnotationCounts() - { - for (ClassFile cf : two.getClasses()) - { - for (Field f : cf.getFields()) - { - int num = this.getNumberOfExports(f.getAnnotations()); - - if (num > 1) - { - logger.warn("Field {} has more than 1 export", f); - ++errors; - } - } - - for (Method m : cf.getMethods()) - { - int num = this.getNumberOfExports(m.getAnnotations()); - - if (num > 1) - { - logger.warn("Method {} has more than 1 export", m); - ++errors; - } - } - } } /** @@ -212,7 +175,6 @@ public class AnnotationIntegrityChecker * @param cf Class file field/method is on * @param name Exported name of field/method * @param isStatic Whether or not field/method is static - * @return */ private boolean isImported(ClassFile cf, String name, boolean isStatic) { @@ -259,7 +221,7 @@ public class AnnotationIntegrityChecker List list = new ArrayList<>(); for (Field f : clazz.getFields()) { - if (DeobAnnotations.getExportedName(f.getAnnotations()) != null) + if (DeobAnnotations.getExportedName(f) != null) { list.add(f); } @@ -272,7 +234,7 @@ public class AnnotationIntegrityChecker List list = new ArrayList<>(); for (Method m : clazz.getMethods()) { - if (DeobAnnotations.getExportedName(m.getAnnotations()) != null) + if (DeobAnnotations.getExportedName(m) != null) { list.add(m); } @@ -280,26 +242,11 @@ public class AnnotationIntegrityChecker return list; } - private int getNumberOfExports(Annotations an) - { - int count = 0; - - for (Annotation a : an.getAnnotations()) - { - if (a.getType().equals(DeobAnnotations.EXPORT)) - { - ++count; - } - } - - return count; - } - private Field findExportedField(ClassFile clazz, String name) { for (Field f : getExportedFields(clazz)) { - if (DeobAnnotations.getExportedName(f.getAnnotations()).equals(name)) + if (name.equals(DeobAnnotations.getExportedName(f))) { return f; } @@ -315,7 +262,7 @@ public class AnnotationIntegrityChecker { if (f.isStatic()) { - if (name.equals(DeobAnnotations.getExportedName(f.getAnnotations()))) + if (name.equals(DeobAnnotations.getExportedName(f))) { return f; } @@ -333,7 +280,7 @@ public class AnnotationIntegrityChecker { if (m.isStatic()) { - if (name.equals(DeobAnnotations.getExportedName(m.getAnnotations()))) + if (name.equals(DeobAnnotations.getExportedName(m))) { return m; } @@ -347,7 +294,7 @@ public class AnnotationIntegrityChecker { for (Method m : getExportedMethods(clazz)) { - if (DeobAnnotations.getExportedName(m.getAnnotations()).equals(name)) + if (name.equals(DeobAnnotations.getExportedName(m))) { return m; } diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java index bd60ec165e..7cbe4c9862 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java @@ -29,10 +29,8 @@ 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.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; -import net.runelite.asm.attributes.annotation.SimpleElement; +import net.runelite.asm.Annotation; +import net.runelite.asm.attributes.Annotated; import net.runelite.deob.DeobAnnotations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,11 +67,11 @@ public class AnnotationMapper { int count = 0; - if (hasCopyableAnnotation(from.getAnnotations())) + if (hasCopyableAnnotation(from)) { if (to != null) { - count += copyAnnotations(from.getAnnotations(), to.getAnnotations()); + count += copyAnnotations(from, to); } else { @@ -83,57 +81,49 @@ public class AnnotationMapper for (Field f : from.getFields()) { - if (!hasCopyableAnnotation(f.getAnnotations())) + if (!hasCopyableAnnotation(f)) continue; Field other = (Field) mapping.get(f); if (other == null) { - logger.warn("Unable to map annotated field {} named {}", f, DeobAnnotations.getExportedName(f.getAnnotations())); + logger.warn("Unable to map annotated field {} named {}", f, DeobAnnotations.getExportedName(f)); continue; } - count += copyAnnotations(f.getAnnotations(), other.getAnnotations()); + count += copyAnnotations(f, other); } for (Method m : from.getMethods()) { - if (!hasCopyableAnnotation(m.getAnnotations())) + if (!hasCopyableAnnotation(m)) continue; Method other = (Method) mapping.get(m); if (other == null) { - logger.warn("Unable to map annotated method {} named {}", m, DeobAnnotations.getExportedName(m.getAnnotations())); + logger.warn("Unable to map annotated method {} named {}", m, DeobAnnotations.getExportedName(m)); continue; } - count += copyAnnotations(m.getAnnotations(), other.getAnnotations()); + count += copyAnnotations(m, other); } return count; } - private int copyAnnotations(Annotations from, Annotations to) + private int copyAnnotations(Annotated from, Annotated to) { int count = 0; if (from.getAnnotations() == null) return count; - for (Annotation a : from.getAnnotations()) + for (Annotation a : from.getAnnotations().values()) { if (isCopyable(a)) { - Annotation annotation = new Annotation(a.getType()); - to.addAnnotation(annotation); - - for (Element e : a.getElements()) - { - Element element = new SimpleElement(e.getName(), e.getValue()); - annotation.addElement(element); - } - + to.addAnnotation(a.getType(), a); ++count; } } @@ -141,13 +131,9 @@ public class AnnotationMapper return count; } - private boolean hasCopyableAnnotation(Annotations a) + private boolean hasCopyableAnnotation(Annotated a) { - for (Annotation an : a.getAnnotations()) - if (isCopyable(an)) - return true; - - return false; + return a.findAnnotation(DeobAnnotations.EXPORT) != null || a.findAnnotation(DeobAnnotations.IMPLEMENTS) != null; } private boolean isCopyable(Annotation a) diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java index 9f2a55df26..4ec9aaec8e 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java @@ -36,7 +36,7 @@ import net.runelite.asm.signature.Signature; public class StaticMethodSignatureMapper { - private Multimap map = LinkedHashMultimap.create(); + private final Multimap map = LinkedHashMultimap.create(); private List getStaticMethods(ClassGroup group) { 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 index 2f7deecfe3..0cbd411952 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscator.java +++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscator.java @@ -33,7 +33,6 @@ import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.Type; import net.runelite.asm.attributes.code.Instruction; -import static net.runelite.asm.attributes.code.InstructionType.INVOKEVIRTUAL; import net.runelite.asm.attributes.code.Instructions; import net.runelite.asm.attributes.code.Label; import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; @@ -55,6 +54,7 @@ import net.runelite.deob.Deobfuscator; import net.runelite.deob.c2s.RWOpcodeFinder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static net.runelite.asm.attributes.code.InstructionType.INVOKEVIRTUAL; public class PacketWriteDeobfuscator implements Deobfuscator { diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java index d2c3d62034..3d5463bdd1 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java @@ -5,10 +5,8 @@ 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.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; -import net.runelite.asm.attributes.annotation.SimpleElement; +import net.runelite.asm.Named; +import net.runelite.asm.attributes.Annotated; import net.runelite.deob.Deob; import net.runelite.deob.DeobAnnotations; import org.slf4j.Logger; @@ -24,7 +22,6 @@ public class AnnotationAdder private final ClassGroup group; private final Logger log = LoggerFactory.getLogger(AnnotationAdder.class); - @SuppressWarnings("unchecked") public void run() { int impl = 0; @@ -46,83 +43,43 @@ public class AnnotationAdder // 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 + else if (!Deob.isObfuscated(c.getClassName())) { - if (!Deob.isObfuscated(c.getClassName())) - { - Annotations an = c.getAnnotations(); - - Annotation implAn = new Annotation(DeobAnnotations.IMPLEMENTS); - - Element value = new SimpleElement(c.getClassName()); - - implAn.addElement(value); - an.addAnnotation(implAn); - impl++; - } + c.addAnnotation(DeobAnnotations.IMPLEMENTS, c.getClassName()); + impl++; } for (Field f : c.getFields()) { - Annotations an = f.getAnnotations(); - - String fieldName = f.getName(); - String exportedName = DeobAnnotations.getExportedName(an); - - if (exportedName == null && Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null) - { - continue; - } - - if (!fieldName.equals(exportedName)) - { - log.info("Changed export from {} to {}", exportedName, fieldName); - Annotation a = an.find(DeobAnnotations.EXPORT); - if (a == null) - { - a = new Annotation(DeobAnnotations.EXPORT); - - Element value = new SimpleElement(fieldName); - a.addElement(value); - an.addAnnotation(a); - - } - a.getElement().setValue(fieldName); + if (addExport(f)) field++; - } } for (Method m : c.getMethods()) { - Annotations an = m.getAnnotations(); - - String methodName = m.getName(); - String exportedName = DeobAnnotations.getExportedName(an); - - if (exportedName == null && Deob.isObfuscated(methodName) || methodName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null) - { - continue; - } - - if (!methodName.equals(exportedName)) - { - log.info("Changed export from {} to {}", exportedName, methodName); - Annotation a = an.find(DeobAnnotations.EXPORT); - if (a == null) - { - a = new Annotation(DeobAnnotations.EXPORT); - - Element value = new SimpleElement(methodName); - a.addElement(value); - an.addAnnotation(a); - - } - a.getElement().setValue(methodName); + if (addExport(m)) meth++; - } } } log.info("Changed {} classes, {} methods, {} fields", impl, meth, field); } + + 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; + } + + log.info("Changed export from {} to {}", exportedName, methodName); + 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 index 5d495b9029..857610b271 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationCopier.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationCopier.java @@ -26,26 +26,26 @@ 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.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; -import net.runelite.asm.attributes.annotation.SimpleElement; +import net.runelite.asm.Annotation; +import net.runelite.asm.attributes.Annotated; public class AnnotationCopier { private final ClassGroup group1, group2; - private final Type[] types; + private final Set types; public AnnotationCopier(ClassGroup group1, ClassGroup group2, Type... types) { this.group1 = group1; this.group2 = group2; - this.types = types; + this.types = new HashSet<>(Arrays.asList(types)); } public void copy() @@ -56,63 +56,46 @@ public class AnnotationCopier assert cf2 != null; - copy(cf1.getAnnotations(), cf2.getAnnotations()); + copy(cf1, cf2); for (Field f : cf1.getFields()) { Field f2 = cf2.findField(f.getName(), f.getType()); - assert f2 != null || f.getAnnotations() == null; + assert f2 != null || f.getAnnotations().isEmpty(); if (f2 == null) continue; - copy(f.getAnnotations(), f2.getAnnotations()); + copy(f, f2); } for (Method m : cf1.getMethods()) { Method m2 = cf2.findMethod(m.getName(), m.getDescriptor()); - assert m2 != null || m.getAnnotations() == null; + assert m2 != null || m == null; if (m2 == null) continue; - copy(m.getAnnotations(), m2.getAnnotations()); + copy(m, m2); } } } - private void copy(Annotations an, Annotations an2) + private void copy(Annotated an, Annotated an2) { - for (Annotation a : an2.getAnnotations()) + for (Annotation a : an.getAnnotations().values()) { - if (isType(a.getType())) - { - an2.removeAnnotation(a); - } - } - - for (Annotation a : an.getAnnotations()) - { - if (!isType(a.getType())) - continue; - - Annotation a2 = new Annotation(a.getType()); - - for (Element element : a.getElements()) - { - Element element2 = new SimpleElement(element.getName(), element.getValue()); - a2.addElement(element2); - } - - an2.addAnnotation(a2); + final var t = a.getType(); + if (isType(t)) + an2.getAnnotations().replace(t, a); } } private boolean isType(Type type) { - return Arrays.asList(types).contains(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 index da920899bc..263a850fa9 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationRenamer.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationRenamer.java @@ -29,8 +29,8 @@ 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.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; +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; @@ -58,20 +58,20 @@ public class AnnotationRenamer for (ClassFile cf : group.getClasses()) { - String name = getImplements(cf.getAnnotations()); + String name = getImplements(cf); if (name != null) mappings.map(cf.getPoolClass(), name); for (Field f : cf.getFields()) { - name = DeobAnnotations.getExportedName(f.getAnnotations()); + name = DeobAnnotations.getExportedName(f); if (name != null) mappings.map(f.getPoolField(), name); } for (Method m : cf.getMethods()) { - name = DeobAnnotations.getExportedName(m.getAnnotations()); + name = DeobAnnotations.getExportedName(m); if (name != null) mappings.map(m.getPoolMethod(), name); } @@ -80,9 +80,9 @@ public class AnnotationRenamer return mappings; } - private String getImplements(Annotations annotations) + private String getImplements(Annotated cf) { - Annotation an = annotations.find(DeobAnnotations.IMPLEMENTS); - return an != null ? an.getElement().getString() : null; + Annotation an = cf.findAnnotation(DeobAnnotations.IMPLEMENTS); + return an == null ? null : an.getValueString(); } } 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 index 9a0a6e7511..97dfc60d1c 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedClass.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedClass.java @@ -27,7 +27,7 @@ public class MappedClass implementingName = DeobAnnotations.getImplements(c); - obfuscatedName = DeobAnnotations.getObfuscatedName(c.getAnnotations()); + obfuscatedName = DeobAnnotations.getObfuscatedName(c); if (obfuscatedName == null) { obfuscatedName = c.getName(); @@ -36,7 +36,7 @@ public class MappedClass ClassFile parent = c.getParent(); if (parent != null) { - superClass = DeobAnnotations.getObfuscatedName(parent.getAnnotations()); + superClass = DeobAnnotations.getObfuscatedName(parent); } access = c.getAccess(); @@ -44,7 +44,6 @@ public class MappedClass interfaces = c.getInterfaces() .getMyInterfaces() .stream() - .map(ClassFile::getAnnotations) .map(DeobAnnotations::getObfuscatedName) .collect(Collectors.toList()); 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 index dc2b7a7242..ba4ae28f54 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedField.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedField.java @@ -26,11 +26,11 @@ public class MappedField { MappingDumper.putMap(f.getPoolField(), this); - exportedName = DeobAnnotations.getExportedName(f.getAnnotations()); + exportedName = DeobAnnotations.getExportedName(f); owner = MappingDumper.getMap(f.getClassFile()).obfuscatedName; - obfuscatedName = DeobAnnotations.getObfuscatedName(f.getAnnotations()); + obfuscatedName = DeobAnnotations.getObfuscatedName(f); if (obfuscatedName == null) { obfuscatedName = f.getName(); 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 index 8131ecd1f6..f2eb549770 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedMethod.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/mappingdumper/MappedMethod.java @@ -4,6 +4,7 @@ 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; @@ -37,11 +38,11 @@ public class MappedMethod public MappedMethod visitMethod(final Method m, final MappingDump dump) { MappingDumper.putMap(m.getPoolMethod(), this); - exportedName = DeobAnnotations.getExportedName(m.getAnnotations()); + exportedName = DeobAnnotations.getExportedName(m); owner = MappingDumper.getMap(m.getClassFile()).obfuscatedName; - obfuscatedName = DeobAnnotations.getObfuscatedName(m.getAnnotations()); + obfuscatedName = DeobAnnotations.getObfuscatedName(m); if (obfuscatedName == null) { obfuscatedName = m.getName(); @@ -94,8 +95,8 @@ public class MappedMethod { Method mme = met.get(0); k = new net.runelite.asm.pool.Method( - new Class(DeobAnnotations.getObfuscatedName(mme.getClassFile().getAnnotations())), - DeobAnnotations.getObfuscatedName(mme.getAnnotations()), + new Class(Objects.requireNonNull(DeobAnnotations.getObfuscatedName(mme.getClassFile()))), + DeobAnnotations.getObfuscatedName(mme), mme.getObfuscatedSignature() != null ? mme.getObfuscatedSignature() : mme.getDescriptor() ); } diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java b/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java index 67364468c0..8cd73d50ef 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java +++ b/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java @@ -34,7 +34,6 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.objectwebasm.NonloadingClassWriter; @@ -118,11 +117,12 @@ public class JarUtil public static void saveJar(ClassGroup group, File jarfile) throws IOException { - try (JarOutputStream jout = new JarOutputStream(new FileOutputStream(jarfile), new Manifest())) + try (JarOutputStream jout = new JarOutputStream(new FileOutputStream(jarfile))) { for (ClassFile cf : group.getClasses()) { JarEntry entry = new JarEntry(cf.getName() + ".class"); + entry.setTime(-1); jout.putNextEntry(entry); byte[] data = writeClass(group, cf); diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java b/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java index 36c1b52c92..b1dea2b93b 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java @@ -27,6 +27,8 @@ package net.runelite.deob.util; import java.util.HashMap; import java.util.Map; +import lombok.Getter; +import lombok.Setter; import net.runelite.asm.pool.Class; import net.runelite.asm.pool.Field; import net.runelite.asm.pool.Method; @@ -36,7 +38,11 @@ public class NameMappings private final Map map = new HashMap<>(); private final Map paramMap = new HashMap<>(); - + + @Getter + @Setter + private int fields, methods, classes; + public void map(Class cf, String name) { map.put(cf, name); diff --git a/deobfuscator/src/test/java/net/runelite/asm/annotations/AnnotationTest.java b/deobfuscator/src/test/java/net/runelite/asm/annotations/AnnotationTest.java index 642dbf076f..8967d2319f 100644 --- a/deobfuscator/src/test/java/net/runelite/asm/annotations/AnnotationTest.java +++ b/deobfuscator/src/test/java/net/runelite/asm/annotations/AnnotationTest.java @@ -27,16 +27,11 @@ package net.runelite.asm.annotations; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.List; -import java.util.Optional; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.ClassUtil; import net.runelite.asm.Method; import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; import net.runelite.deob.util.JarUtil; import org.junit.Assert; import org.junit.Test; @@ -62,20 +57,14 @@ public class AnnotationTest Method method = cf.getMethods().get(1); Assert.assertEquals("method1", method.getName()); - Annotations annotations = method.getAnnotations(); - Assert.assertNotNull(annotations); + var annotation = method.findAnnotation(new Type("Lnet/runelite/asm/annotations/MyAnnotation;")); + Assert.assertNotNull(annotation); - Optional annotation = annotations.getAnnotations().stream().filter(a -> a.getType().equals(new Type("Lnet/runelite/asm/annotations/MyAnnotation;"))).findFirst(); - Assert.assertTrue(annotation.isPresent()); + Assert.assertEquals(1, annotation.size()); - Annotation an = annotation.get(); - List elements = an.getElements(); - - Assert.assertEquals(1, elements.size()); - - Element element = elements.get(0); - - Assert.assertEquals("value", element.getName()); - Assert.assertEquals("method1", element.getValue()); + Object element = annotation.getValue(); + Object also = annotation.get("value"); + Assert.assertEquals(also, element); + Assert.assertEquals("method1", element); } } diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java index 53481982c5..4e0ee82add 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java @@ -82,7 +82,7 @@ public class MappingDumper for (ClassFile cf : group.getClasses()) { String implName = cf.getName(); - String className = DeobAnnotations.getObfuscatedName(cf.getAnnotations()); + String className = DeobAnnotations.getObfuscatedName(cf); if (implName != null) { @@ -92,7 +92,7 @@ public class MappingDumper for (Field f : cf.getFields()) { - String exportName = DeobAnnotations.getExportedName(f.getAnnotations()); + String exportName = DeobAnnotations.getExportedName(f); if (exportName == null) { @@ -101,7 +101,7 @@ public class MappingDumper ++fields; - String fieldName = DeobAnnotations.getObfuscatedName(f.getAnnotations()); + String fieldName = DeobAnnotations.getObfuscatedName(f); Type type = f.getType(); Number getter = DeobAnnotations.getObfuscatedGetter(f); @@ -171,7 +171,7 @@ public class MappingDumper for (Method m : cf.getMethods()) { - String exportName = DeobAnnotations.getExportedName(m.getAnnotations()); + String exportName = DeobAnnotations.getExportedName(m); if (exportName == null) { @@ -180,7 +180,7 @@ public class MappingDumper methods++; - String methodName = DeobAnnotations.getObfuscatedName(m.getAnnotations()); + String methodName = DeobAnnotations.getObfuscatedName(m); Signature signature = DeobAnnotations.getObfuscatedSignature(m); String garbageValue = DeobAnnotations.getDecoder(m); @@ -329,18 +329,18 @@ public class MappingDumper for (ClassFile cf : group.getClasses()) { String implName = DeobAnnotations.getImplements(cf); - String className = DeobAnnotations.getObfuscatedName(cf.getAnnotations()); + String className = DeobAnnotations.getObfuscatedName(cf); for (Field f : cf.getFields()) { - String exportName = DeobAnnotations.getExportedName(f.getAnnotations()); + String exportName = DeobAnnotations.getExportedName(f); if (exportName == null) { continue; } - String fieldName = DeobAnnotations.getObfuscatedName(f.getAnnotations()); + String fieldName = DeobAnnotations.getObfuscatedName(f); Type obfType = DeobAnnotations.getObfuscatedType(f); Number getter = DeobAnnotations.getObfuscatedGetter(f); @@ -351,7 +351,7 @@ public class MappingDumper jField.addProperty("class", className); jField.addProperty("field", fieldName); jField.addProperty("obfSignature", (obfType != null ? obfType.toString() : "")); - jField.addProperty("signature", f.getType().toString()); + jField.addProperty("descriptor", f.getType().toString()); jField.addProperty("multiplier", (getter != null ? getter : 0)); jField.addProperty("static", f.isStatic()); @@ -361,14 +361,14 @@ public class MappingDumper for (Method m : cf.getMethods()) { - String exportName = DeobAnnotations.getExportedName(m.getAnnotations()); + String exportName = DeobAnnotations.getExportedName(m); if (exportName == null) { continue; } - String methodName = DeobAnnotations.getObfuscatedName(m.getAnnotations()); + String methodName = DeobAnnotations.getObfuscatedName(m); Signature obfSignature = DeobAnnotations.getObfuscatedSignature(m); String predicate = DeobAnnotations.getDecoder(m); @@ -379,7 +379,7 @@ public class MappingDumper jMethod.addProperty("class", className); jMethod.addProperty("field", methodName); jMethod.addProperty("obfSignature", (obfSignature != null ? obfSignature.toString() : "")); - jMethod.addProperty("signature", m.getDescriptor().toString()); + jMethod.addProperty("descriptor", m.getDescriptor().toString()); jMethod.addProperty("predicate", (predicate != null ? predicate : "")); jMethod.addProperty("static", m.isStatic()); diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java index 97c82e6734..0f7b3eaf01 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -8,7 +8,6 @@ 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.Annotations; import net.runelite.deob.Deob; import net.runelite.deob.DeobAnnotations; import net.runelite.deob.DeobTestProperties; @@ -58,14 +57,12 @@ public class AnnotationCleaner for (Field f : c.getFields()) { - Annotations an = f.getAnnotations(); - String fieldName = f.getName(); - String exportedName = DeobAnnotations.getExportedName(an); + String exportedName = DeobAnnotations.getExportedName(f); if (exportedName == null) { - if (!Deob.isObfuscated(fieldName) && DeobAnnotations.getObfuscatedName(an) != null) + if (!Deob.isObfuscated(fieldName) && DeobAnnotations.getObfuscatedName(f) != null) { missing.add("Export: (field) " + className + '.' + fieldName + " == missing"); } @@ -78,14 +75,12 @@ public class AnnotationCleaner for (Method m : c.getMethods()) { - Annotations an = m.getAnnotations(); - String methodName = m.getName(); - String exportedName = DeobAnnotations.getExportedName(an); + String exportedName = DeobAnnotations.getExportedName(m); if (exportedName == null) { - if (!Deob.isObfuscated(methodName) && DeobAnnotations.getObfuscatedName(an) != null) + if (!Deob.isObfuscated(methodName) && DeobAnnotations.getObfuscatedName(m) != null) { missing.add("Export: (method) " + className + '.' + methodName + " == missing"); } @@ -124,7 +119,7 @@ public class AnnotationCleaner JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/niec.jar")); } - private class OhNoException extends Exception + private static class OhNoException extends Exception { private OhNoException() { diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java index bb34282e22..eea6cea7ab 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java @@ -105,16 +105,16 @@ public class UpdateMappingsTest { for (ClassFile cf : group.getClasses()) { - cf.getAnnotations().clearAnnotations(); + cf.getAnnotations().clear(); for (Field f : cf.getFields()) { - f.getAnnotations().clearAnnotations(); + f.getAnnotations().clear(); } for (Method m : cf.getMethods()) { - m.getAnnotations().clearAnnotations(); + m.getAnnotations().clear(); } } } @@ -136,8 +136,8 @@ public class UpdateMappingsTest assert otherf != null : "unable to find " + f; - String name = DeobAnnotations.getExportedName(f.getAnnotations()); - String otherName = DeobAnnotations.getExportedName(otherf.getAnnotations()); + String name = DeobAnnotations.getExportedName(f); + String otherName = DeobAnnotations.getExportedName(otherf); Assert.assertEquals(name + " <-> " + otherName, name, otherName); } @@ -148,8 +148,8 @@ public class UpdateMappingsTest assert otherm != null : "unable to find " + m; - String name = DeobAnnotations.getExportedName(m.getAnnotations()); - String otherName = DeobAnnotations.getExportedName(otherm.getAnnotations()); + String name = DeobAnnotations.getExportedName(m); + String otherName = DeobAnnotations.getExportedName(otherm); Assert.assertEquals(name + " <-> " + otherName, name, otherName); } diff --git a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java index ac178bfa7b..5475b69558 100644 --- a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java @@ -36,10 +36,9 @@ 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.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.attributes.Annotated; import net.runelite.asm.signature.Signature; +import net.runelite.deob.DeobAnnotations; import net.runelite.deob.util.JarUtil; import net.runelite.osb.inject.ClassHook; import net.runelite.osb.inject.FieldHook; @@ -88,17 +87,17 @@ public class HookImporter { int classes = 0, fields = 0, methods = 0, callbacks = 0; - for (String deobfuscatedClassName : hooks.keySet()) + for (Map.Entry entry : hooks.entrySet()) { - ClassHook ch = hooks.get(deobfuscatedClassName); + ClassHook ch = entry.getValue(); ClassFile cf = this.findClassWithObfuscatedName(ch.getClazz()); assert cf != null; - String implementsName = getAnnotation(cf.getAnnotations(), IMPLEMENTS); + String implementsName = getAnnotation(cf, IMPLEMENTS); if (implementsName.isEmpty()) { - cf.getAnnotations().addAnnotation(IMPLEMENTS, "value", deobfuscatedClassName); + cf.addAnnotation(IMPLEMENTS, entry.getKey()); ++classes; } @@ -127,10 +126,10 @@ public class HookImporter assert f != null; - String exportedName = getAnnotation(f.getAnnotations(), EXPORT); + String exportedName = getAnnotation(f, EXPORT); if (exportedName.isEmpty()) { - f.getAnnotations().addAnnotation(EXPORT, "value", deobfuscatedFieldName); + f.addAnnotation(EXPORT, deobfuscatedFieldName); ++fields; } } @@ -160,10 +159,10 @@ public class HookImporter assert m != null; - String exportedName = getAnnotation(m.getAnnotations(), EXPORT); + String exportedName = getAnnotation(m, EXPORT); if (exportedName.isEmpty()) { - m.getAnnotations().addAnnotation(EXPORT, "value", deobfuscatedMethodName); + m.addAnnotation(EXPORT, deobfuscatedMethodName); ++methods; } } @@ -193,10 +192,10 @@ public class HookImporter assert m != null; - String exportedName = getAnnotation(m.getAnnotations(), EXPORT); + String exportedName = getAnnotation(m, EXPORT); if (exportedName.isEmpty()) { - m.getAnnotations().addAnnotation(EXPORT, "value", deobfuscatedMethodName); + m.addAnnotation(EXPORT, deobfuscatedMethodName); ++callbacks; } } @@ -214,8 +213,7 @@ public class HookImporter return c; } - Annotations an = c.getAnnotations(); - if (getAnnotation(an, OBFUSCATED_NAME).equals(name)) + if (getAnnotation(c, OBFUSCATED_NAME).equals(name)) { return c; } @@ -227,8 +225,7 @@ public class HookImporter { for (Field f : c.getFields()) { - Annotations an = f.getAnnotations(); - if (getAnnotation(an, OBFUSCATED_NAME).equals(name)) + if (name.equals(DeobAnnotations.getObfuscatedName(f))) { return f; } @@ -242,8 +239,7 @@ public class HookImporter for (Method m : c.getMethods()) { - Annotations an = m.getAnnotations(); - if (getAnnotation(an, OBFUSCATED_NAME).equals(name)) + if (getAnnotation(m, OBFUSCATED_NAME).equals(name)) { Signature methodSig = getObfuscatedMethodSignature(m); @@ -261,30 +257,15 @@ public class HookImporter return null; } - private String getAnnotation(Annotations an, Type type) + private String getAnnotation(Annotated an, Type type) { - if (an == null) - { - return ""; - } - - for (Annotation a : an.getAnnotations()) - { - if (a.getType().equals(type)) - { - for (Element e : a.getElements()) - { - return (String) e.getValue(); - } - } - } - - return ""; + final var s = DeobAnnotations.getStringValue(an, type); + return s == null ? "" : s; } private Signature getObfuscatedMethodSignature(Method method) { - String sig = getAnnotation(method.getAnnotations(), OBFUSCATED_SIGNATURE); + String sig = getAnnotation(method, OBFUSCATED_SIGNATURE); if (!sig.isEmpty()) { return toObSignature(new Signature(sig)); // if it is annoted, use that @@ -310,8 +291,7 @@ public class HookImporter ClassFile cf = group.findClass(t.getInternalName()); assert cf != null; - Annotations an = cf.getAnnotations(); - String obfuscatedName = an.find(OBFUSCATED_NAME).getElement().getString(); + String obfuscatedName = (String) cf.findAnnotation(OBFUSCATED_NAME).getValue(); return Type.getType("L" + obfuscatedName + ";", t.getDimensions()); } diff --git a/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java b/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java index 6e8cbd8c72..62c23e3651 100644 --- a/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java @@ -30,9 +30,9 @@ import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; import net.runelite.asm.Field; import net.runelite.asm.Type; -import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.Annotation; +import net.runelite.asm.attributes.Annotated; +import net.runelite.deob.DeobAnnotations; import net.runelite.deob.util.JarUtil; import net.runelite.runeloader.inject.AddInterfaceInstruction; import net.runelite.runeloader.inject.GetterInjectInstruction; @@ -73,29 +73,13 @@ public class MappingImporter JarUtil.saveJar(group, OUT); } - private boolean hasObfuscatedName(Annotations an, String name) + private boolean hasObfuscatedName(Annotated an, String name) { if (an == null) { return false; } - - for (Annotation a : an.getAnnotations()) - { - if (a.getType().equals(OBFUSCATED_NAME)) - { - for (Element e : a.getElements()) - { - String str = (String) e.getValue(); - if (str.equals(name)) - { - return true; - } - } - } - } - - return false; + return name.equals(DeobAnnotations.getStringValue(an, OBFUSCATED_NAME)); } private ClassFile findClassWithObfuscatedName(String name) @@ -107,8 +91,7 @@ public class MappingImporter return c; } - Annotations an = c.getAnnotations(); - if (this.hasObfuscatedName(an, name)) + if (this.hasObfuscatedName(c, name)) { return c; } @@ -120,8 +103,7 @@ public class MappingImporter { for (Field f : c.getFields()) { - Annotations an = f.getAnnotations(); - if (this.hasObfuscatedName(an, name)) + if (this.hasObfuscatedName(f, name)) { return f; } @@ -131,7 +113,7 @@ public class MappingImporter @Test @Ignore - public void makeMappings() throws IOException + public void makeMappings() { InjectionModscript mod = Injection.load(MappingImporter.class.getResourceAsStream(RL_INJECTION)); int fields = 0, classes = 0; @@ -154,12 +136,10 @@ public class MappingImporter String attrName = gii.getGetterName(); attrName = Utils.toExportedName(attrName); - Annotations an = f.getAnnotations(); - - Annotation a = an.find(EXPORT); + Annotation a = f.findAnnotation(EXPORT); if (a != null) { - String exportedName = a.getElement().getString(); + String exportedName = a.getValueString(); if (!attrName.equals(exportedName)) { @@ -168,7 +148,7 @@ public class MappingImporter } else { - an.addAnnotation(EXPORT, "value", attrName); + f.addAnnotation(EXPORT, attrName); logger.info("Exporting field " + f + " with name " + attrName); ++fields; @@ -184,12 +164,10 @@ public class MappingImporter iface = iface.replace("com/runeloader/api/bridge/os/accessor/", ""); - Annotations an = cf.getAnnotations(); - - Annotation a = an.find(IMPLEMENTS); + Annotation a = cf.findAnnotation(IMPLEMENTS); if (a != null) { - String implementsName = a.getElement().getString(); + String implementsName = a.getValueString(); if (!iface.equals(implementsName)) { @@ -198,7 +176,7 @@ public class MappingImporter } else { - an.addAnnotation(IMPLEMENTS, "value", iface); + cf.addAnnotation(IMPLEMENTS, iface); logger.info("Exporting class " + cf.getName() + " with name " + iface); ++classes; diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index d72e2ea46c..0c661b69df 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -36,9 +36,7 @@ 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.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.attributes.Annotated; import net.runelite.asm.attributes.code.LocalVariable; import net.runelite.asm.attributes.code.Parameter; import net.runelite.asm.signature.Signature; @@ -107,11 +105,11 @@ public class HookImporter assert cf != null; - String implementsName = getAnnotation(cf.getAnnotations(), IMPLEMENTS); + String implementsName = getAnnotation(cf, IMPLEMENTS); if (implementsName.isEmpty()) { String deobfuscatedClassName = hc.clazz; - cf.getAnnotations().addAnnotation(IMPLEMENTS, "value", deobfuscatedClassName); + cf.addAnnotation(IMPLEMENTS, deobfuscatedClassName); mappings.map(cf.getPoolClass(), deobfuscatedClassName); ++classes; } @@ -138,7 +136,7 @@ public class HookImporter continue; } - String exportedName = getAnnotation(f.getAnnotations(), EXPORT); + String exportedName = getAnnotation(f, EXPORT); if (exportedName.isEmpty()) { String deobfuscatedFieldName = fh.field; @@ -150,7 +148,7 @@ public class HookImporter continue; } - f.getAnnotations().addAnnotation(EXPORT, "value", deobfuscatedFieldName); + f.addAnnotation(EXPORT, deobfuscatedFieldName); mappings.map(f.getPoolField(), deobfuscatedFieldName); ++fields; } @@ -219,7 +217,7 @@ public class HookImporter List virtualMethods = VirtualMethods.getVirtualMethods(m); for (Method method : virtualMethods) { - String exportedName = getAnnotation(method.getAnnotations(), EXPORT); + String exportedName = getAnnotation(method, EXPORT); if (!exportedName.isEmpty()) { if (!exportedName.equals(hm.method)) @@ -231,7 +229,7 @@ public class HookImporter } String deobfuscatedMethodName = hm.method; - m.getAnnotations().addAnnotation(EXPORT, "value", deobfuscatedMethodName); + m.addAnnotation(EXPORT, deobfuscatedMethodName); mappings.map(m.getPoolMethod(), deobfuscatedMethodName); ++methods; } @@ -252,8 +250,7 @@ public class HookImporter return c; } - Annotations an = c.getAnnotations(); - if (getAnnotation(an, OBFUSCATED_NAME).equals(name)) + if (getAnnotation(c, OBFUSCATED_NAME).equals(name)) { return c; } @@ -265,8 +262,7 @@ public class HookImporter { for (Field f : c.getFields()) { - Annotations an = f.getAnnotations(); - if (getAnnotation(an, OBFUSCATED_NAME).equals(name)) + if (getAnnotation(f, OBFUSCATED_NAME).equals(name)) { return f; } @@ -280,8 +276,7 @@ public class HookImporter for (Method m : c.getMethods()) { - Annotations an = m.getAnnotations(); - if (m.getName().equals(name) || getAnnotation(an, OBFUSCATED_NAME).equals(name)) + if (m.getName().equals(name) || getAnnotation(m, OBFUSCATED_NAME).equals(name)) { Signature methodSig = getObfuscatedMethodSignature(m); @@ -294,15 +289,12 @@ public class HookImporter return null; } - private String getAnnotation(Annotations an, Type type) + private String getAnnotation(Annotated an, Type type) { - Annotation a = an.find(type); + final var a = an.findAnnotation(type); if (a != null) { - for (Element e : a.getElements()) - { - return (String) e.getValue(); - } + return a.getValueString(); } return ""; @@ -310,7 +302,7 @@ public class HookImporter private Signature getObfuscatedMethodSignature(Method method) { - String sig = getAnnotation(method.getAnnotations(), OBFUSCATED_SIGNATURE); + String sig = getAnnotation(method, OBFUSCATED_SIGNATURE); if (sig.isEmpty()) { return method.getDescriptor(); diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05355..e708b1c023 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 186b71557c..bca17f3656 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51583..4f906e0c81 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a7a9..ac1b06f938 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/http-api/http-api.gradle.kts b/http-api/http-api.gradle.kts index 19b587c39d..31afceac61 100644 --- a/http-api/http-api.gradle.kts +++ b/http-api/http-api.gradle.kts @@ -30,18 +30,17 @@ description = "Web API" dependencies { annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") - compileOnly(group = "javax.inject", name = "javax.inject", version = "1") compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "29.0-jre") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.7.2") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.4") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.8.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.5") implementation(group = "org.apache.commons", name = "commons-csv", version = "1.8") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(project(":runelite-api")) - testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.7.2") + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.8.0") testImplementation(group = "junit", name = "junit", version = "4.13") testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") } diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index c6452700e9..a92cd5bb59 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -66,6 +66,7 @@ public class RuneLiteAPI private static final String STATICBASE = "https://static.runelite.net"; private static final String OPENOSRS_SESSION = "http://session.openosrs.dev"; + private static final String OPENOSRS_XTEA = "http://xtea.openosrs.dev"; private static final String MAVEN_METADATA = "https://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml"; private static final Properties properties = new Properties(); @@ -121,6 +122,11 @@ public class RuneLiteAPI return HttpUrl.parse(OPENOSRS_SESSION); } + public static HttpUrl getXteaBase() + { + return HttpUrl.parse(OPENOSRS_XTEA); + } + public static HttpUrl getApiBase() { final String prop = System.getProperty("runelite.http-service.url"); diff --git a/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java b/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java index b68933c63e..6df019f7a6 100644 --- a/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java +++ b/http-api/src/main/java/net/runelite/http/api/account/AccountClient.java @@ -30,24 +30,22 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.UUID; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@Slf4j +@RequiredArgsConstructor public class AccountClient { - private static final Logger logger = LoggerFactory.getLogger(AccountClient.class); - + private final OkHttpClient client; private UUID uuid; - public AccountClient() - { - } - - public AccountClient(UUID uuid) + public void setUuid(UUID uuid) { this.uuid = uuid; } @@ -60,13 +58,13 @@ public class AccountClient .addQueryParameter("uuid", uuid.toString()) .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { InputStream in = response.body().byteStream(); return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), OAuthResponse.class); @@ -84,16 +82,16 @@ public class AccountClient .addPathSegment("logout") .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { - logger.debug("Sent logout request"); + log.debug("Sent logout request"); } } @@ -104,8 +102,8 @@ public class AccountClient .addPathSegment("session-check") .build(); - logger.debug("Built URI: {}", url); - + log.debug("Built URI: {}", url); + return Observable.fromCallable(() -> { Request request = new Request.Builder() @@ -113,13 +111,13 @@ public class AccountClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { - return response.isSuccessful(); + return response.isSuccessful(); } catch (IOException ex) { - logger.debug("Unable to verify session", ex); + log.debug("Unable to verify session", ex); return true; // assume it is still valid if the server is unreachable } }); diff --git a/http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java b/http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java index 4a23d4ac06..f66f652fe3 100644 --- a/http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java +++ b/http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java @@ -28,16 +28,19 @@ import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import lombok.AllArgsConstructor; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; +@AllArgsConstructor public class ChatClient { - private static final RequestBody body = RequestBody.Companion.create(new byte[0], null); + private final OkHttpClient client; public boolean submitKc(String username, String boss, int kc) throws IOException { @@ -49,13 +52,12 @@ public class ChatClient .addQueryParameter("kc", Integer.toString(kc)) .build(); - Request request = new Request.Builder() .post(RequestBody.create(null, new byte[0])) .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -74,7 +76,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -98,7 +100,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -116,7 +118,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -143,7 +145,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -161,7 +163,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -192,7 +194,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -211,7 +213,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -235,7 +237,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -253,7 +255,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -280,7 +282,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -299,7 +301,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -328,7 +330,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { return response.isSuccessful(); } @@ -346,7 +348,7 @@ public class ChatClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { diff --git a/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java b/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java index 63fc7c444e..f8b069b0a5 100644 --- a/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java +++ b/http-api/src/main/java/net/runelite/http/api/config/ConfigClient.java @@ -30,44 +30,41 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.UUID; import java.util.concurrent.CompletableFuture; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; import okhttp3.MediaType; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@AllArgsConstructor +@Slf4j public class ConfigClient { - private static final Logger logger = LoggerFactory.getLogger(ConfigClient.class); - private static final MediaType TEXT_PLAIN = MediaType.parse("text/plain"); + private final OkHttpClient client; private final UUID uuid; - public ConfigClient(UUID uuid) - { - this.uuid = uuid; - } - public Configuration get() throws IOException { HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("config") .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { InputStream in = response.body().byteStream(); return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), Configuration.class); @@ -87,7 +84,7 @@ public class ConfigClient .addPathSegment(key) .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .put(RequestBody.create(TEXT_PLAIN, value)) @@ -95,12 +92,12 @@ public class ConfigClient .url(url) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - logger.warn("Unable to synchronize configuration item", e); + log.warn("Unable to synchronize configuration item", e); future.completeExceptionally(e); } @@ -108,7 +105,7 @@ public class ConfigClient public void onResponse(Call call, Response response) { response.close(); - logger.debug("Synchronized configuration value '{}' to '{}'", key, value); + log.debug("Synchronized configuration value '{}' to '{}'", key, value); future.complete(null); } }); @@ -125,7 +122,7 @@ public class ConfigClient .addPathSegment(key) .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .delete() @@ -133,12 +130,12 @@ public class ConfigClient .url(url) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - logger.warn("Unable to unset configuration item", e); + log.warn("Unable to unset configuration item", e); future.completeExceptionally(e); } @@ -146,7 +143,7 @@ public class ConfigClient public void onResponse(Call call, Response response) { response.close(); - logger.debug("Unset configuration value '{}'", key); + log.debug("Unset configuration value '{}'", key); future.complete(null); } }); diff --git a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java index 43096a61e1..6d28ef7c46 100644 --- a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java +++ b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java @@ -25,23 +25,26 @@ package net.runelite.http.api.examine; import java.io.IOException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; import okhttp3.MediaType; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@Slf4j +@RequiredArgsConstructor public class ExamineClient { - private static final Logger logger = LoggerFactory.getLogger(ExamineClient.class); - private static final MediaType TEXT = MediaType.parse("text"); + private final OkHttpClient client; + public void submitObject(int id, String text) { submit("object", id, text); @@ -65,7 +68,7 @@ public class ExamineClient .addPathSegment(Integer.toString(id)) .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); RequestBody body = RequestBody.Companion.create(text, TEXT); Request request = new Request.Builder() @@ -73,19 +76,19 @@ public class ExamineClient .post(body) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - logger.warn("Error submitting examine", e); + log.warn("Error submitting examine", e); } @Override public void onResponse(Call call, Response response) { response.close(); - logger.debug("Submitted examine info for {} {}: {}", type, id, text); + log.debug("Submitted examine info for {} {}: {}", type, id, text); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/feed/FeedClient.java b/http-api/src/main/java/net/runelite/http/api/feed/FeedClient.java index bf4698315c..62cddfa599 100644 --- a/http-api/src/main/java/net/runelite/http/api/feed/FeedClient.java +++ b/http-api/src/main/java/net/runelite/http/api/feed/FeedClient.java @@ -28,34 +28,27 @@ import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import javax.inject.Inject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@Slf4j +@RequiredArgsConstructor public class FeedClient { - private static final Logger logger = LoggerFactory.getLogger(FeedClient.class); - private final OkHttpClient client; - @Inject - public FeedClient(OkHttpClient client) - { - this.client = client; - } - public FeedResult lookupFeed() throws IOException { HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("feed.js") .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .url(url) @@ -65,7 +58,7 @@ public class FeedClient { if (!response.isSuccessful()) { - logger.debug("Error looking up feed: {}", response); + log.debug("Error looking up feed: {}", response); return null; } diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java index c48f5b74fc..18204f6a56 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java @@ -27,6 +27,7 @@ package net.runelite.http.api.ge; import com.google.gson.Gson; import java.io.IOException; import java.util.UUID; +import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; @@ -34,15 +35,19 @@ import static net.runelite.http.api.RuneLiteAPI.JSON; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; @Slf4j +@RequiredArgsConstructor public class GrandExchangeClient { private static final Gson GSON = RuneLiteAPI.GSON; + private final OkHttpClient client; + @Setter private UUID uuid; @Setter @@ -70,7 +75,7 @@ public class GrandExchangeClient .url(url) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java index a725089de4..2807f8f411 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreClient.java @@ -25,9 +25,10 @@ package net.runelite.http.api.hiscore; import java.io.IOException; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import org.apache.commons.csv.CSVFormat; @@ -35,8 +36,11 @@ import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; @Slf4j +@RequiredArgsConstructor public class HiscoreClient { + private final OkHttpClient client; + public HiscoreResult lookup(String username, HiscoreEndpoint endpoint) throws IOException { return lookup(username, endpoint.getHiscoreURL()); @@ -97,7 +101,7 @@ public class HiscoreClient String responseStr; - try (Response okresponse = RuneLiteAPI.CLIENT.newCall(okrequest).execute()) + try (Response okresponse = client.newCall(okrequest).execute()) { if (!okresponse.isSuccessful()) { diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java b/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java index 6622709384..d563b9f502 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemClient.java @@ -34,28 +34,21 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Arrays; import javax.imageio.ImageIO; -import javax.inject.Inject; import javax.naming.directory.SearchResult; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@Slf4j +@AllArgsConstructor public class ItemClient { - private static final Logger logger = LoggerFactory.getLogger(ItemClient.class); - private final OkHttpClient client; - @Inject - public ItemClient(OkHttpClient client) - { - this.client = client; - } - public ItemPrice lookupItemPrice(int itemId) throws IOException { HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() @@ -64,7 +57,7 @@ public class ItemClient .addPathSegment("price") .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .url(url) @@ -74,7 +67,7 @@ public class ItemClient { if (!response.isSuccessful()) { - logger.debug("Error looking up item {}: {}", itemId, response); + log.debug("Error looking up item {}: {}", itemId, response); return null; } @@ -100,7 +93,7 @@ public class ItemClient HttpUrl url = urlBuilder.build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .url(url) @@ -110,7 +103,7 @@ public class ItemClient { if (!response.isSuccessful()) { - logger.debug("Error looking up items {}: {}", Arrays.toString(itemIds), response); + log.debug("Error looking up items {}: {}", Arrays.toString(itemIds), response); return null; } @@ -131,7 +124,7 @@ public class ItemClient .addPathSegment("icon") .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .url(url) @@ -143,7 +136,7 @@ public class ItemClient { if (!response.isSuccessful()) { - logger.debug("Error grabbing icon {}: {}", itemId, response); + log.debug("Error grabbing icon {}: {}", itemId, response); return Observable.just(null); } @@ -164,7 +157,7 @@ public class ItemClient .addQueryParameter("query", itemName) .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); return Observable.defer(() -> { @@ -176,7 +169,7 @@ public class ItemClient { if (!response.isSuccessful()) { - logger.debug("Error looking up item {}: {}", itemName, response); + log.debug("Error looking up item {}: {}", itemName, response); return Observable.just(null); } @@ -198,7 +191,7 @@ public class ItemClient HttpUrl url = urlBuilder.build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); return Observable.fromCallable(() -> { @@ -235,7 +228,7 @@ public class ItemClient .addPathSegment("stats.ids.min.json") .build(); - logger.debug("Built URI {}", url); + log.debug("Built URI {}", url); return Observable.fromCallable(() -> { Request request = new Request.Builder() diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java b/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java index d0815ea90d..0afdce988e 100644 --- a/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java +++ b/http-api/src/main/java/net/runelite/http/api/item/ItemEquipmentStats.java @@ -24,6 +24,7 @@ */ package net.runelite.http.api.item; +import com.google.gson.annotations.SerializedName; import lombok.Builder; import lombok.Value; @@ -33,6 +34,9 @@ public class ItemEquipmentStats { private int slot; + @SerializedName("is2h") + private boolean isTwoHanded; + private int astab; private int aslash; private int acrush; @@ -51,4 +55,3 @@ public class ItemEquipmentStats private int prayer; private int aspeed; } - diff --git a/http-api/src/main/java/net/runelite/http/api/loottracker/LootRecord.java b/http-api/src/main/java/net/runelite/http/api/loottracker/LootRecord.java index 993959ee88..18f41fc0f0 100644 --- a/http-api/src/main/java/net/runelite/http/api/loottracker/LootRecord.java +++ b/http-api/src/main/java/net/runelite/http/api/loottracker/LootRecord.java @@ -41,6 +41,7 @@ public class LootRecord @Getter private String username; private LootRecordType type; + private Object metadata; private Collection drops; private Instant time; diff --git a/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java b/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java index eb6f2274f1..caf5fec897 100644 --- a/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java +++ b/http-api/src/main/java/net/runelite/http/api/loottracker/LootTrackerClient.java @@ -41,6 +41,7 @@ import static net.runelite.http.api.RuneLiteAPI.JSON; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; @@ -51,6 +52,7 @@ public class LootTrackerClient { private static final Gson GSON = RuneLiteAPI.GSON; + private final OkHttpClient client; private final UUID uuid; public CompletableFuture submit(Collection lootRecords) @@ -68,7 +70,7 @@ public class LootTrackerClient .url(url) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) @@ -100,7 +102,7 @@ public class LootTrackerClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { @@ -133,7 +135,7 @@ public class LootTrackerClient .url(builder.build()) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) diff --git a/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java b/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java index 96a6bb4324..868fada66a 100644 --- a/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java +++ b/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java @@ -29,15 +29,20 @@ import io.reactivex.rxjava3.core.Observable; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @Slf4j +@AllArgsConstructor public class OSBGrandExchangeClient { + private final OkHttpClient client; + public Observable lookupItem(int itemId) { final HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() @@ -50,23 +55,23 @@ public class OSBGrandExchangeClient return Observable.defer(() -> { - Request request = new Request.Builder() + final Request request = new Request.Builder() .url(url) .build(); - - try (final Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + + try (final Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) { return Observable.error(new IOException("Error looking up item id: " + response)); } - + final InputStream in = response.body().byteStream(); return Observable.just(RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), OSBGrandExchangeResult.class)); } - catch (JsonParseException e) + catch (JsonParseException ex) { - return Observable.error(e); + return Observable.error(ex); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java index b9f3bfb556..4c7b5df6e4 100644 --- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java +++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java @@ -29,35 +29,28 @@ import com.google.gson.JsonParseException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import javax.inject.Inject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.CacheControl; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@Slf4j +@RequiredArgsConstructor public class WorldClient { - private static final Logger logger = LoggerFactory.getLogger(WorldClient.class); - private final OkHttpClient client; - @Inject - public WorldClient(OkHttpClient client) - { - this.client = client; - } - public WorldResult lookupWorlds() throws IOException { HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() .addPathSegment("worlds.js") .build(); - logger.debug("Built URI: {}", url); + log.debug("Built URI: {}", url); Request request = new Request.Builder() .url(url) @@ -68,7 +61,7 @@ public class WorldClient { if (!response.isSuccessful()) { - logger.debug("Error looking up worlds: {}", response); + log.debug("Error looking up worlds: {}", response); throw new IOException("unsuccessful response looking up worlds"); } diff --git a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java index c45fe2e209..76acf6ad63 100644 --- a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java @@ -25,18 +25,24 @@ package net.runelite.http.api.xp; import java.io.IOException; +import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@Slf4j public class XpClient { - private static final Logger logger = LoggerFactory.getLogger(XpClient.class); + private final OkHttpClient client; + + public XpClient(OkHttpClient client) + { + this.client = client; + } public void update(String username) { @@ -50,19 +56,19 @@ public class XpClient .url(url) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - logger.warn("Error submitting xp track", e); + log.warn("Error submitting xp track", e); } @Override public void onResponse(Call call, Response response) { response.close(); - logger.debug("Submitted xp track for {}", username); + log.debug("Submitted xp track for {}", username); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java new file mode 100644 index 0000000000..0fa181165c --- /dev/null +++ b/http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java @@ -0,0 +1,115 @@ +/* + * 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.http.api.xtea; + +import com.google.gson.JsonParseException; +import com.google.gson.reflect.TypeToken; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.HashMap; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import net.runelite.http.api.RuneLiteAPI; +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; + +@Slf4j +@AllArgsConstructor +public class XteaClient +{ + private final OkHttpClient client; + + public void submit(int region, int[] keys) + { + + HttpUrl url = RuneLiteAPI.getXteaBase().newBuilder() + .addPathSegment("submit") + .addQueryParameter("region", String.valueOf(region)) + .addQueryParameter("key1", String.valueOf(keys[0])) + .addQueryParameter("key2", String.valueOf(keys[1])) + .addQueryParameter("key3", String.valueOf(keys[2])) + .addQueryParameter("key4", String.valueOf(keys[3])) + .build(); + + log.debug("Built URI: {}", url); + + Request request = new Request.Builder() + .url(url) + .build(); + + client.newCall(request).enqueue(new Callback() + { + @Override + public void onFailure(Call call, IOException e) + { + log.warn("unable to submit xtea keys", e); + } + + @Override + public void onResponse(Call call, Response response) + { + try + { + if (!response.isSuccessful()) + { + log.debug("unsuccessful xtea response"); + } + } + finally + { + response.close(); + } + } + }); + } + + public HashMap get() throws IOException + { + HttpUrl url = RuneLiteAPI.getXteaBase().newBuilder() + .addPathSegment("get") + .build(); + + Request request = new Request.Builder() + .url(url) + .build(); + + try (Response response = client.newCall(request).execute()) + { + InputStream in = response.body().byteStream(); + // CHECKSTYLE:OFF + return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken>() {}.getType()); + // CHECKSTYLE:ON + } + catch (JsonParseException ex) + { + throw new IOException(ex); + } + } +} \ No newline at end of file diff --git a/injected-client/injected-client.gradle.kts b/injected-client/injected-client.gradle.kts index ce8883caec..4544988097 100644 --- a/injected-client/injected-client.gradle.kts +++ b/injected-client/injected-client.gradle.kts @@ -62,14 +62,10 @@ injector { vanilla.set(vanillaDep.singleFile) } -artifacts { - runtimeElements(tasks.inject.get().output) -} - // keep the sourcesets etc but remove useless tasks tasks { inject { - dependsOn(configurations["combined"]) + dependsOn(combined) } classes { enabled = false @@ -86,7 +82,4 @@ tasks { processResources { enabled = false } - assemble { - finalizedBy("inject") - } } diff --git a/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedSignature.java b/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedSignature.java index 1c0bf31b35..09b2585257 100644 --- a/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedSignature.java +++ b/injection-annotations/src/main/java/net/runelite/mapping/ObfuscatedSignature.java @@ -36,7 +36,7 @@ import java.lang.annotation.Target; }) public @interface ObfuscatedSignature { - String signature(); + String descriptor(); String garbageValue() default ""; // valid garbage value for last parameter. can't be an Object because Java. } diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index f0dd7ef524..51f8e58852 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -292,6 +292,7 @@ public final class AnimationID public static final int ROCKSLUG_DEATH = 1568; public static final int ZYGOMITE_DEATH = 3327; public static final int IMP_DEATH = 172; + public static final int NIGHTMARE_DEATH = 8612; // POH Animations public static final int INCENSE_BURNER = 3687; diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 8b03591b67..a2d918d729 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -407,6 +407,11 @@ public interface Client extends GameShell */ IndexDataBase getIndexScripts(); + /** + * Gets the config index. + */ + IndexDataBase getIndexConfig(); + /** * Returns the x-axis base coordinate. *

@@ -488,6 +493,7 @@ public interface Client extends GameShell * @param widget the widget info * @return the widget */ + @Nullable Widget getWidget(WidgetInfo widget); /** @@ -500,6 +506,7 @@ public interface Client extends GameShell * @param childId the child widget ID * @return the widget corresponding to the group and child pair */ + @Nullable Widget getWidget(int groupId, int childId); /** @@ -809,6 +816,12 @@ public interface Client extends GameShell */ void setVarbitValue(int[] varps, int varbit, int value); + /** + * Gets the varbit composition for a given varbit id + */ + @Nullable + VarbitDefinition getVarbitDefinition(int id); + /** * Gets the widget flags table. * @@ -1870,6 +1883,10 @@ public interface Client extends GameShell boolean isSpellSelected(); + String getSelectedSpellActionName(); + + int getSelectedSpellFlags(); + /** * Set whether or not player attack options will be hidden for friends */ @@ -1924,8 +1941,12 @@ public interface Client extends GameShell void setSelectedItemID(int id); + int getSelectedItemWidget(); + void setSelectedItemWidget(int widgetID); + int getSelectedItemSlot(); + void setSelectedItemSlot(int idx); int getSelectedSpellWidget(); @@ -2050,4 +2071,12 @@ public interface Client extends GameShell * @see KeyCode */ boolean isKeyPressed(int keycode); + + int getFollowerIndex(); + + int isItemSelected(); + + String getSelectedItemName(); + + Widget getMessageContinueWidget(); } diff --git a/runelite-api/src/main/java/net/runelite/api/EnumID.java b/runelite-api/src/main/java/net/runelite/api/EnumID.java index bb4ec6fa7b..4a3fcce359 100644 --- a/runelite-api/src/main/java/net/runelite/api/EnumID.java +++ b/runelite-api/src/main/java/net/runelite/api/EnumID.java @@ -33,6 +33,7 @@ public final class EnumID { public static final int MUSIC_TRACK_NAMES = 812; public static final int MUSIC_TRACK_IDS = 819; + public static final int XPDROP_COLORS = 1169; /** * Translates spellbook varbit into enum ID diff --git a/runelite-api/src/main/java/net/runelite/api/IndexDataBase.java b/runelite-api/src/main/java/net/runelite/api/IndexDataBase.java index 58fb7d498a..3c2e5db0b8 100644 --- a/runelite-api/src/main/java/net/runelite/api/IndexDataBase.java +++ b/runelite-api/src/main/java/net/runelite/api/IndexDataBase.java @@ -1,3 +1,27 @@ +/* + * Copyright (c) 2020, Lucas + * 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.api; /** @@ -9,4 +33,9 @@ public interface IndexDataBase * Returns true if any cache overlay in this index is outdated due to hash mismatch */ boolean isOverlayOutdated(); + + /** + * Get the child file ids for a given group + */ + int[] getFileIds(int group); } diff --git a/runelite-api/src/main/java/net/runelite/api/InventoryID.java b/runelite-api/src/main/java/net/runelite/api/InventoryID.java index aad10b3ee6..364c214584 100644 --- a/runelite-api/src/main/java/net/runelite/api/InventoryID.java +++ b/runelite-api/src/main/java/net/runelite/api/InventoryID.java @@ -33,6 +33,14 @@ public enum InventoryID * Reward from fishing trawler */ FISHING_TRAWLER_REWARD(0), + /** + * The trade inventory. + */ + TRADE(90), + /** + * The other trade inventory. + */ + TRADEOTHER(90 | 0x8000), /** * Standard player inventory. */ diff --git a/runelite-api/src/main/java/net/runelite/api/ItemContainer.java b/runelite-api/src/main/java/net/runelite/api/ItemContainer.java index 81e2074106..9bd2332e86 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemContainer.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemContainer.java @@ -67,4 +67,10 @@ public interface ItemContainer extends Node * @see ItemID */ int count(int itemId); + + /** + * Get the number of items in this item container. May include empty slots. + * @return + */ + int size(); } diff --git a/runelite-api/src/main/java/net/runelite/api/ItemDefinition.java b/runelite-api/src/main/java/net/runelite/api/ItemDefinition.java index d215589a07..b79db8b109 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemDefinition.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemDefinition.java @@ -75,6 +75,14 @@ public interface ItemDefinition */ int getPrice(); + /** + * Get the high alchemy price for this item. All items have a high alchemy price, + * but not all items can be alched. + * + * @return the high alch price + */ + int getHaPrice(); + /** * Checks whether the item is members only. * @@ -103,6 +111,8 @@ public interface ItemDefinition */ String[] getInventoryActions(); + String[] getGroundActions(); + /** * Gets the menu action index of the shift-click action. * diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index bfe2567712..e558348953 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -8159,7 +8159,7 @@ public final class ItemID public static final int HUMAN_EYE = 12843; public static final int VOICE_POTION = 12844; public static final int GRIM_REAPER_HOOD = 12845; - public static final int BOUNTY_TELEPORT_SCROLL = 12846; + public static final int TARGET_TELEPORT_SCROLL = 12846; public static final int GRANITE_MAUL_12848 = 12848; public static final int GRANITE_CLAMP = 12849; public static final int AMULET_OF_THE_DAMNED_FULL = 12851; @@ -11321,7 +11321,7 @@ public final class ItemID public static final int BIRTHDAY_CAKE_24331 = 24331; public static final int BIRTHDAY_CAKE_24332 = 24332; public static final int DAGONHAI_ROBES_SET = 24333; - public static final int BOUNTY_TARGET_TELEPORT = 24336; + public static final int TARGET_TELEPORT = 24336; public static final int BOUNTY_HUNTER_HAT_TIER_1 = 24338; public static final int BOUNTY_HUNTER_HAT_TIER_2 = 24340; public static final int BOUNTY_HUNTER_HAT_TIER_3 = 24342; @@ -11578,5 +11578,20 @@ public final class ItemID public static final int ZIGGY = 24849; public static final int SOFT_CLAY_PACK_24851 = 24851; public static final int BAG_FULL_OF_GEMS_24853 = 24853; + public static final int MYTHICAL_MAX_CAPE = 24855; + public static final int MYTHICAL_MAX_HOOD = 24857; + public static final int WARRIOR_PATH_STARTER_KIT = 24859; + public static final int WIZARD_PATH_STARTER_KIT = 24860; + public static final int RANGER_PATH_STARTER_KIT = 24861; + public static final int KARAMJAN_MONKEY = 24862; + public static final int ZOMBIE_MONKEY = 24863; + public static final int MANIACAL_MONKEY = 24864; + public static final int SKELETON_MONKEY = 24865; + public static final int KRUK_JR = 24866; + public static final int PRINCELY_MONKEY = 24867; + public static final int GOLDEN_ARMADYL_SPECIAL_ATTACK = 24868; + public static final int GOLDEN_BANDOS_SPECIAL_ATTACK = 24869; + public static final int GOLDEN_SARADOMIN_SPECIAL_ATTACK = 24870; + public static final int GOLDEN_ZAMORAK_SPECIAL_ATTACK = 24871; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/KeyCode.java b/runelite-api/src/main/java/net/runelite/api/KeyCode.java index 66770d8b6a..bf9befd953 100644 --- a/runelite-api/src/main/java/net/runelite/api/KeyCode.java +++ b/runelite-api/src/main/java/net/runelite/api/KeyCode.java @@ -29,5 +29,87 @@ package net.runelite.api; */ public final class KeyCode { + public static final int KC_F1 = 1; + public static final int KC_F2 = 2; + public static final int KC_F3 = 3; + public static final int KC_F4 = 4; + public static final int KC_F5 = 5; + public static final int KC_F6 = 6; + public static final int KC_F7 = 7; + public static final int KC_F8 = 8; + public static final int KC_F9 = 9; + public static final int KC_F10 = 10; + public static final int KC_F11 = 11; + public static final int KC_F12 = 12; + public static final int KC_ESCAPE = 13; + + public static final int KC_1 = 16; + public static final int KC_2 = 17; + public static final int KC_3 = 18; + public static final int KC_4 = 19; + public static final int KC_5 = 20; + public static final int KC_6 = 21; + public static final int KC_7 = 22; + public static final int KC_8 = 23; + public static final int KC_9 = 24; + public static final int KC_0 = 25; + public static final int KC_MINUS = 26; + public static final int KC_EQUALS = 27; + public static final int KC_TILDE = 28; + + public static final int KC_Q = 32; + public static final int KC_W = 33; + public static final int KC_E = 34; + public static final int KC_R = 35; + public static final int KC_T = 36; + public static final int KC_Y = 37; + public static final int KC_U = 38; + public static final int KC_I = 39; + public static final int KC_O = 40; + public static final int KC_P = 41; + public static final int KC_OPEN_BRACKET = 42; + public static final int KC_CLOSE_BRACKET = 43; + + public static final int KC_A = 48; + public static final int KC_S = 49; + public static final int KC_D = 50; + public static final int KC_F = 51; + public static final int KC_G = 52; + public static final int KC_H = 53; + public static final int KC_J = 54; + public static final int KC_K = 55; + public static final int KC_L = 56; + public static final int KC_SEMICOLON = 57; + public static final int KC_QUOTE = 58; + + public static final int KC_Z = 64; + public static final int KC_X = 65; + public static final int KC_C = 66; + public static final int KC_V = 67; + public static final int KC_B = 68; + public static final int KC_N = 69; + public static final int KC_M = 70; + public static final int KC_COMMA = 71; + public static final int KC_PERIOD = 72; + public static final int KC_FORWARD_SLASH = 73; + public static final int KC_BACK_SLASH = 74; + + public static final int KC_TAB = 80; public static final int KC_SHIFT = 81; + public static final int KC_CONTROL = 82; + public static final int KC_SPACE = 83; + public static final int KC_ENTER = 84; + public static final int KC_BACKSPACE = 85; + public static final int KC_ALT = 86; + + public static final int KC_LEFT = 96; + public static final int KC_RIGHT = 97; + public static final int KC_UP = 98; + public static final int KC_DOWN = 99; + public static final int KC_INSERT = 100; + public static final int KC_DELETE = 101; + public static final int KC_HOME = 102; + public static final int KC_END = 103; + public static final int KC_PAGE_UP = 104; + public static final int KC_PAGE_DOWN = 105; } diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 642de57dfb..a309a15622 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8758,5 +8758,38 @@ public final class NpcID public static final int GRAVE = 9856; public static final int GRAVE_9857 = 9857; public static final int SQUIRE_10368 = 10368; + public static final int BOBAWU = 10369; + public static final int MARTEN = 10370; + public static final int WIZARD_10371 = 10371; + public static final int WIZARD_10372 = 10372; + public static final int WIZARD_10373 = 10373; + public static final int HILL_GIANT_10374 = 10374; + public static final int HILL_GIANT_10375 = 10375; + public static final int HILL_GIANT_10376 = 10376; + public static final int FEROX = 10377; + public static final int SIGISMUND = 10378; + public static final int ZAMORAKIAN_ACOLYTE = 10379; + public static final int ZAMORAKIAN_ACOLYTE_10380 = 10380; + public static final int ZAMORAKIAN_ACOLYTE_10381 = 10381; + public static final int REFUGEE = 10382; + public static final int REFUGEE_10383 = 10383; + public static final int REFUGEE_10384 = 10384; + public static final int REFUGEE_10385 = 10385; + public static final int PHABELLE_BILE = 10386; + public static final int DERSE_VENATOR = 10387; + public static final int ANDROS_MAI = 10388; + public static final int BANKER_10389 = 10389; + public static final int MERCENARY_10390 = 10390; + public static final int FINANCIAL_WIZARD_10391 = 10391; + public static final int CAMARST = 10392; + public static final int WARRIOR_OF_MURAHS = 10393; + public static final int WARRIOR_OF_MURAHS_10394 = 10394; + public static final int WARRIOR_OF_MURAHS_10395 = 10395; + public static final int SPIKED_TUROTH = 10397; + public static final int SHADOW_WYRM = 10398; + public static final int SHADOW_WYRM_10399 = 10399; + public static final int GUARDIAN_DRAKE = 10400; + public static final int GUARDIAN_DRAKE_10401 = 10401; + public static final int COLOSSAL_HYDRA = 10402; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 66cfc9b1df..ec4e73815d 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13068,5 +13068,7 @@ public final class NullItemID public static final int NULL_24850 = 24850; public static final int NULL_24852 = 24852; public static final int NULL_24854 = 24854; + public static final int NULL_24856 = 24856; + public static final int NULL_24858 = 24858; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index 99e56e7411..cc1cb6dd36 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -1592,5 +1592,6 @@ public final class NullNpcID public static final int NULL_10365 = 10365; public static final int NULL_10366 = 10366; public static final int NULL_10367 = 10367; + public static final int NULL_10396 = 10396; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 071ab447bf..33b1125075 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -18031,22 +18031,8 @@ public final class NullObjectID public static final int NULL_37430 = 37430; public static final int NULL_37432 = 37432; public static final int NULL_37433 = 37433; - public static final int NULL_37436 = 37436; - public static final int NULL_37437 = 37437; - public static final int NULL_37438 = 37438; public static final int NULL_37439 = 37439; public static final int NULL_37440 = 37440; - public static final int NULL_37446 = 37446; - public static final int NULL_37447 = 37447; - public static final int NULL_37448 = 37448; - public static final int NULL_37449 = 37449; - public static final int NULL_37451 = 37451; - public static final int NULL_37452 = 37452; - public static final int NULL_37453 = 37453; - public static final int NULL_37454 = 37454; - public static final int NULL_37455 = 37455; - public static final int NULL_37456 = 37456; - public static final int NULL_37457 = 37457; public static final int NULL_37467 = 37467; public static final int NULL_37468 = 37468; public static final int NULL_37469 = 37469; @@ -19517,5 +19503,81 @@ public final class NullObjectID public static final int NULL_39616 = 39616; public static final int NULL_39618 = 39618; public static final int NULL_39619 = 39619; + public static final int NULL_39622 = 39622; + public static final int NULL_39623 = 39623; + public static final int NULL_39624 = 39624; + public static final int NULL_39625 = 39625; + public static final int NULL_39626 = 39626; + public static final int NULL_39627 = 39627; + public static final int NULL_39628 = 39628; + public static final int NULL_39629 = 39629; + public static final int NULL_39630 = 39630; + public static final int NULL_39631 = 39631; + public static final int NULL_39632 = 39632; + public static final int NULL_39633 = 39633; + public static final int NULL_39634 = 39634; + public static final int NULL_39635 = 39635; + public static final int NULL_39636 = 39636; + public static final int NULL_39638 = 39638; + public static final int NULL_39649 = 39649; + public static final int NULL_39654 = 39654; + public static final int NULL_39655 = 39655; + public static final int NULL_39656 = 39656; + public static final int NULL_39661 = 39661; + public static final int NULL_39662 = 39662; + public static final int NULL_39663 = 39663; + public static final int NULL_39664 = 39664; + public static final int NULL_39665 = 39665; + public static final int NULL_39666 = 39666; + public static final int NULL_39667 = 39667; + public static final int NULL_39668 = 39668; + public static final int NULL_39669 = 39669; + public static final int NULL_39670 = 39670; + public static final int NULL_39671 = 39671; + public static final int NULL_39672 = 39672; + public static final int NULL_39673 = 39673; + public static final int NULL_39683 = 39683; + public static final int NULL_39684 = 39684; + public static final int NULL_39685 = 39685; + public static final int NULL_39686 = 39686; + public static final int NULL_39694 = 39694; + public static final int NULL_39701 = 39701; + public static final int NULL_39702 = 39702; + public static final int NULL_39703 = 39703; + public static final int NULL_39704 = 39704; + public static final int NULL_39705 = 39705; + public static final int NULL_39706 = 39706; + public static final int NULL_39707 = 39707; + public static final int NULL_39708 = 39708; + public static final int NULL_39709 = 39709; + public static final int NULL_39710 = 39710; + public static final int NULL_39711 = 39711; + public static final int NULL_39712 = 39712; + public static final int NULL_39713 = 39713; + public static final int NULL_39714 = 39714; + public static final int NULL_39715 = 39715; + public static final int NULL_39717 = 39717; + public static final int NULL_39722 = 39722; + public static final int NULL_39725 = 39725; + public static final int NULL_39726 = 39726; + public static final int NULL_39727 = 39727; + public static final int NULL_39728 = 39728; + public static final int NULL_39729 = 39729; + public static final int NULL_39730 = 39730; + public static final int NULL_39731 = 39731; + public static final int NULL_39732 = 39732; + public static final int NULL_39733 = 39733; + public static final int NULL_39734 = 39734; + public static final int NULL_39735 = 39735; + public static final int NULL_39736 = 39736; + public static final int NULL_39737 = 39737; + public static final int NULL_39738 = 39738; + public static final int NULL_39739 = 39739; + public static final int NULL_39742 = 39742; + public static final int NULL_39743 = 39743; + public static final int NULL_39744 = 39744; + public static final int NULL_39745 = 39745; + public static final int NULL_39746 = 39746; + public static final int NULL_39747 = 39747; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index d050738b5f..5f7d2f6fa3 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -8061,7 +8061,7 @@ public final class ObjectID public static final int STONE_BLOCK_14203 = 14203; public static final int STONE_BLOCK_14204 = 14204; public static final int STONE_BLOCK_14205 = 14205; - public static final int FINAL_OWNAGE_ELITE_STATUE = 14209; + public static final int HERBS_14209 = 14209; public static final int WALL_14212 = 14212; public static final int WALL_14213 = 14213; public static final int WALL_14216 = 14216; @@ -14137,11 +14137,11 @@ public final class ObjectID public static final int HUTCH_26822 = 26822; public static final int CAGES_26823 = 26823; public static final int CAGE_26824 = 26824; - public static final int ANCIENT_FURY_STATUE = 26825; - public static final int FATALITY_STATUE = 26826; - public static final int HEXIS_STATUE = 26827; - public static final int REIGN_OF_TERROR_STATUE = 26828; - public static final int STUD_UNIT_STATUE = 26829; + public static final int HERBS_26825 = 26825; + public static final int HERBS_26826 = 26826; + public static final int HERBS_26827 = 26827; + public static final int HERBS_26828 = 26828; + public static final int HERBS_26829 = 26829; public static final int CONSECRATED_HOUSE = 26830; public static final int DESECRATED_HOUSE = 26831; public static final int NATURE_HOUSE = 26832; @@ -19396,7 +19396,6 @@ public final class ObjectID public static final int DECORATIVE_WINDOW_37442 = 37442; public static final int STAINEDGLASS_WINDOW_37443 = 37443; public static final int LOG_PILE_37444 = 37444; - public static final int HOTSPOT_MARKER = 37445; public static final int DECORATIVE_WINDOW_37450 = 37450; public static final int STAINEDGLASS_WINDOW_37458 = 37458; public static final int DECORATIVE_WINDOW_37459 = 37459; @@ -20089,6 +20088,191 @@ public final class ObjectID public static final int COFFIN_39608 = 39608; public static final int STAIRS_39609 = 39609; public static final int CRYPT = 39617; - public static final int COFFIN_39620 = 39620; + public static final int RUSTED_ANVIL = 39620; + public static final int MOUNTED_MAX_CAPE_39621 = 39621; + public static final int DEATHS_DOMAIN_39637 = 39637; + public static final int CASUAL = 39639; + public static final int COMPETITIVE = 39640; + public static final int HIGH_STAKES = 39641; + public static final int ALTAR_39642 = 39642; + public static final int STAIRS_39643 = 39643; + public static final int LADDER_39644 = 39644; + public static final int LADDER_39645 = 39645; + public static final int LIFT_PLATFORM_39646 = 39646; + public static final int STAIRS_39647 = 39647; + public static final int OPENING_39648 = 39648; + public static final int STAIRS_39650 = 39650; + public static final int POOL_OF_REFRESHMENT = 39651; + public static final int BARRIER_39652 = 39652; + public static final int BARRIER_39653 = 39653; + public static final int GATE_39657 = 39657; + public static final int GATE_39658 = 39658; + public static final int GATE_39659 = 39659; + public static final int GATE_39660 = 39660; + public static final int STATUE_39674 = 39674; + public static final int CORPSE_39675 = 39675; + public static final int TREE_39676 = 39676; + public static final int TREE_39677 = 39677; + public static final int TREE_39678 = 39678; + public static final int TREE_39679 = 39679; + public static final int BUSH_39680 = 39680; + public static final int BUSH_39681 = 39681; + public static final int BUSH_39682 = 39682; + public static final int BENCH_39687 = 39687; + public static final int CAMPING_EQUIPMENT_39688 = 39688; + public static final int TWISTED_CRATE = 39689; + public static final int BARREL_39690 = 39690; + public static final int STONE_PILE_39691 = 39691; + public static final int STONE_PILE_39692 = 39692; + public static final int WOOD_39693 = 39693; + public static final int SACKS_39695 = 39695; + public static final int SACKS_39696 = 39696; + public static final int FLOWERS_39697 = 39697; + public static final int FLOWERS_39698 = 39698; + public static final int FLOWERS_39699 = 39699; + public static final int FLOWERS_39700 = 39700; + public static final int TABLE_39716 = 39716; + public static final int STOOL_39718 = 39718; + public static final int HOLE_39719 = 39719; + public static final int WELL_39720 = 39720; + public static final int CAVE_39721 = 39721; + public static final int ALTAR_39723 = 39723; + public static final int GIANT_ANVIL_39724 = 39724; + public static final int STONE_PILE_39740 = 39740; + public static final int STONE_PILE_39741 = 39741; + public static final int HERBS_39748 = 39748; + public static final int HERBS_39749 = 39749; + public static final int HERBS_39750 = 39750; + public static final int HERBS_39751 = 39751; + public static final int HERBS_39752 = 39752; + public static final int HERBS_39753 = 39753; + public static final int HERBS_39754 = 39754; + public static final int HERBS_39755 = 39755; + public static final int HERBS_39756 = 39756; + public static final int HERBS_39757 = 39757; + public static final int HERBS_39758 = 39758; + public static final int HERBS_39759 = 39759; + public static final int HERBS_39760 = 39760; + public static final int HERBS_39761 = 39761; + public static final int HERBS_39762 = 39762; + public static final int HERBS_39763 = 39763; + public static final int HERBS_39764 = 39764; + public static final int HERBS_39765 = 39765; + public static final int HERBS_39766 = 39766; + public static final int HERBS_39767 = 39767; + public static final int HERBS_39768 = 39768; + public static final int HERBS_39769 = 39769; + public static final int HERBS_39770 = 39770; + public static final int HERBS_39771 = 39771; + public static final int HERBS_39772 = 39772; + public static final int HERBS_39773 = 39773; + public static final int HERBS_39774 = 39774; + public static final int HERBS_39775 = 39775; + public static final int HERBS_39776 = 39776; + public static final int HERBS_39777 = 39777; + public static final int HERBS_39778 = 39778; + public static final int HERBS_39779 = 39779; + public static final int HERBS_39780 = 39780; + public static final int HERBS_39781 = 39781; + public static final int HERBS_39782 = 39782; + public static final int HERBS_39783 = 39783; + public static final int HERBS_39784 = 39784; + public static final int HERBS_39785 = 39785; + public static final int HERBS_39786 = 39786; + public static final int HERBS_39787 = 39787; + public static final int HERBS_39788 = 39788; + public static final int HERBS_39789 = 39789; + public static final int HERBS_39790 = 39790; + public static final int HERBS_39791 = 39791; + public static final int HERBS_39792 = 39792; + public static final int HERBS_39793 = 39793; + public static final int HERBS_39794 = 39794; + public static final int HERBS_39795 = 39795; + public static final int HERBS_39796 = 39796; + public static final int HERBS_39797 = 39797; + public static final int HERBS_39798 = 39798; + public static final int HERBS_39799 = 39799; + public static final int HERBS_39800 = 39800; + public static final int HERBS_39801 = 39801; + public static final int HERBS_39802 = 39802; + public static final int HERBS_39803 = 39803; + public static final int HERBS_39804 = 39804; + public static final int HERBS_39805 = 39805; + public static final int HERBS_39806 = 39806; + public static final int HERBS_39807 = 39807; + public static final int HERBS_39808 = 39808; + public static final int HERBS_39809 = 39809; + public static final int HERBS_39810 = 39810; + public static final int HERBS_39811 = 39811; + public static final int HERB_PATCH_39812 = 39812; + public static final int HERB_PATCH_39813 = 39813; + public static final int HERBS_39814 = 39814; + public static final int HERBS_39815 = 39815; + public static final int HERBS_39816 = 39816; + public static final int HERB_PATCH_39817 = 39817; + public static final int HERB_PATCH_39818 = 39818; + public static final int HERBS_39819 = 39819; + public static final int HERBS_39820 = 39820; + public static final int HERBS_39821 = 39821; + public static final int HERB_PATCH_39822 = 39822; + public static final int HERB_PATCH_39823 = 39823; + public static final int HERBS_39824 = 39824; + public static final int HERBS_39825 = 39825; + public static final int HERBS_39826 = 39826; + public static final int HERB_PATCH_39827 = 39827; + public static final int HERB_PATCH_39828 = 39828; + public static final int HERBS_39829 = 39829; + public static final int HERBS_39830 = 39830; + public static final int HERBS_39831 = 39831; + public static final int HERB_PATCH_39832 = 39832; + public static final int HERB_PATCH_39833 = 39833; + public static final int HERBS_39834 = 39834; + public static final int HERBS_39835 = 39835; + public static final int HERBS_39836 = 39836; + public static final int HERB_PATCH_39837 = 39837; + public static final int HERB_PATCH_39838 = 39838; + public static final int HERBS_39839 = 39839; + public static final int HERBS_39840 = 39840; + public static final int HERBS_39841 = 39841; + public static final int HERB_PATCH_39842 = 39842; + public static final int HERB_PATCH_39843 = 39843; + public static final int HERBS_39844 = 39844; + public static final int HERBS_39845 = 39845; + public static final int HERBS_39846 = 39846; + public static final int HERB_PATCH_39847 = 39847; + public static final int HERB_PATCH_39848 = 39848; + public static final int HERBS_39849 = 39849; + public static final int HERBS_39850 = 39850; + public static final int HERBS_39851 = 39851; + public static final int HERB_PATCH_39852 = 39852; + public static final int HERB_PATCH_39853 = 39853; + public static final int HERBS_39854 = 39854; + public static final int HERBS_39855 = 39855; + public static final int HERBS_39856 = 39856; + public static final int HERB_PATCH_39857 = 39857; + public static final int HERB_PATCH_39858 = 39858; + public static final int HERBS_39859 = 39859; + public static final int HERBS_39860 = 39860; + public static final int HERBS_39861 = 39861; + public static final int HERB_PATCH_39862 = 39862; + public static final int HERB_PATCH_39863 = 39863; + public static final int HERBS_39864 = 39864; + public static final int HERBS_39865 = 39865; + public static final int HERBS_39866 = 39866; + public static final int HERB_PATCH_39867 = 39867; + public static final int HERB_PATCH_39868 = 39868; + public static final int HERBS_39869 = 39869; + public static final int HERBS_39870 = 39870; + public static final int HERBS_39871 = 39871; + public static final int HERB_PATCH_39872 = 39872; + public static final int HERB_PATCH_39873 = 39873; + public static final int HERBS_39874 = 39874; + public static final int HERBS_39875 = 39875; + public static final int HERBS_39876 = 39876; + public static final int HERB_PATCH_39877 = 39877; + public static final int HERB_PATCH_39878 = 39878; + public static final int HERBS_39879 = 39879; + public static final int HERBS_39880 = 39880; + public static final int HERBS_39881 = 39881; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/Player.java b/runelite-api/src/main/java/net/runelite/api/Player.java index 2bb160d2f2..b8fbd7bccd 100644 --- a/runelite-api/src/main/java/net/runelite/api/Player.java +++ b/runelite-api/src/main/java/net/runelite/api/Player.java @@ -89,4 +89,12 @@ public interface Player extends Actor */ @Nullable SkullIcon getSkullIcon(); + + /** + * This is almost always not what you want + * @return literal 0 + */ + int getRSSkillLevel(); + + String[] getActions(); } diff --git a/runelite-api/src/main/java/net/runelite/api/PlayerAppearance.java b/runelite-api/src/main/java/net/runelite/api/PlayerAppearance.java index 2348968eda..c700ee8c3f 100644 --- a/runelite-api/src/main/java/net/runelite/api/PlayerAppearance.java +++ b/runelite-api/src/main/java/net/runelite/api/PlayerAppearance.java @@ -31,6 +31,13 @@ import net.runelite.api.kit.KitType; */ public interface PlayerAppearance { + /** + * Checks if the player is female. + * + * @return true if the player is female + */ + boolean isFemale(); + /** * Gets an array of IDs related to equipment slots. *

diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index c55147788f..9e684a6fe5 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -167,8 +167,8 @@ public final class ScriptID * * Updates the VarClientInts (73, 74) to this same value *

    - *
  • int Reset zoom position
    • - *
  • int Reset zoom position
    • + *
  • int Reset zoom position for fixed viewport mode
    • + *
  • int Reset zoom position for resizable viewport mode
    • *
*/ @ScriptArguments(integer = 2) @@ -241,12 +241,6 @@ public final class ScriptID @ScriptArguments(integer = 18) public static final int BANKMAIN_SEARCH_TOGGLE = 281; - /** - * Builds the items kept on death widget - */ - @ScriptArguments(integer = 4, string = 2) - public static final int DEATH_KEEP_BUILD = 1601; - /** * Builds the widget that holds all of the players inside a friends chat */ @@ -329,4 +323,28 @@ public final class ScriptID */ @ScriptArguments(integer = 2) public static final int TOPLEVEL_REDRAW = 907; + + /** + * Called to set position of an xpdrop text and sprite(s) + *
    + *
  • XP drop parent component
    • + *
+ */ + @ScriptArguments(integer = 4, string = 1) + public static final int XPDROPS_SETDROPSIZE = 996; + + /** + * Main layout script for the bank + *
    + *
  • int (WidgetID) * 17, various widgets making up the bank interface
    • + *
+ */ + @ScriptArguments(integer = 17) + public static final int BANKMAIN_BUILD = 277; + + @ScriptArguments(integer = 19) + public static final int BANKMAIN_FINISHBUILDING = 505; + + @ScriptArguments() + public static final int BANKMAIN_SEARCHING = 514; } diff --git a/runelite-api/src/main/java/net/runelite/api/TileItem.java b/runelite-api/src/main/java/net/runelite/api/TileItem.java index 8184835f20..51d9bbc713 100644 --- a/runelite-api/src/main/java/net/runelite/api/TileItem.java +++ b/runelite-api/src/main/java/net/runelite/api/TileItem.java @@ -42,4 +42,9 @@ public interface TileItem extends Entity * @return */ int getSpawnTime(); + + /** + * @return the tile this item is on + */ + Tile getTile(); } diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java b/runelite-api/src/main/java/net/runelite/api/VarbitDefinition.java similarity index 54% rename from deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java rename to runelite-api/src/main/java/net/runelite/api/VarbitDefinition.java index 10b59b5b27..b0fbf7266b 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java +++ b/runelite-api/src/main/java/net/runelite/api/VarbitDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, Adam + * Copyright (c) 2020, Adam * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,70 +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.api; -package net.runelite.asm.attributes.annotation; - -import java.util.List; -import org.objectweb.asm.AnnotationVisitor; - -public abstract class Element +public interface VarbitDefinition { - String name = "value"; + /** + * The varp index for this varbit + */ + int getIndex(); - T value; + /** + * The least significant bit of the varbit + */ + int getLeastSignificantBit(); - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public T getValue() - { - return value; - } - - public void setValue(T value) - { - this.value = value; - } - - public String getString() - { - return value.toString(); - } - - public static void accept(AnnotationVisitor visitor, final String name, final Object value) - { - if (visitor == null) - { - return; - } - - if (value instanceof Annotation) - { - Annotation annotation = (Annotation) value; - annotation.accept(visitor.visitAnnotation(name, annotation.getType().toString())); - } - else if (value instanceof List) - { - AnnotationVisitor arr = visitor.visitArray(name); - List arrayValue = (List) value; - - for (Object o : arrayValue) - { - accept(arr, null, o); - } - - arr.visitEnd(); - } - else - { - visitor.visit(name, value); - } - } -} + /** + * The most significant bit of the varbit (inclusive) + */ + int getMostSignificantBit(); +} \ No newline at end of file diff --git a/runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java b/runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java similarity index 92% rename from runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java rename to runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java index 80dae32f01..c976f2fe9c 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java @@ -25,13 +25,13 @@ package net.runelite.api.events; import lombok.Value; -import net.runelite.api.Player; +import net.runelite.api.Actor; /** - * An event when a player dies. + * An event fired when an actor dies. */ @Value -public class PlayerDeath implements Event +public class ActorDeath implements Event { - Player player; + Actor actor; } diff --git a/runelite-api/src/main/java/net/runelite/api/events/ScriptPreFired.java b/runelite-api/src/main/java/net/runelite/api/events/ScriptPreFired.java index a338145e4f..55c58ac4a3 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ScriptPreFired.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ScriptPreFired.java @@ -24,22 +24,22 @@ */ package net.runelite.api.events; -import lombok.Data; +import lombok.Value; import net.runelite.api.ScriptEvent; /** * An event that is fired before the designated script is ran */ -@Data +@Value public class ScriptPreFired implements Event { /** * The script id of the invoked script */ - private final int scriptId; + int scriptId; /** * The input of the script invoke, this will be null unless it is the root script */ - private ScriptEvent scriptEvent; + ScriptEvent scriptEvent; } diff --git a/runelite-api/src/main/java/net/runelite/api/vars/SlayerUnlock.java b/runelite-api/src/main/java/net/runelite/api/vars/SlayerUnlock.java index 05081da7a2..4ad46dc060 100644 --- a/runelite-api/src/main/java/net/runelite/api/vars/SlayerUnlock.java +++ b/runelite-api/src/main/java/net/runelite/api/vars/SlayerUnlock.java @@ -79,7 +79,13 @@ public enum SlayerUnlock RUNE_DRAGON_EXTEND(41), VORKATH_SLAYER_HELM(42), FOSSIL_ISLAND_WYVERN_DISABLE(43, Varbits.FOSSIL_ISLAND_WYVERN_DISABLE), - GROTESQUE_GUARDIAN_DOUBLE_COUNT(44); + GROTESQUE_GUARDIAN_DOUBLE_COUNT(44), + HYDRA_SLAYER_HELM(45), + BASILISK_EXTEND(46), + BASILISK_UNLOCK(47), + OLM_SLAYER_HELM(48), + VAMPYRE_EXTEND(49), + VAMPYRE_UNLOCK(50); private Varbits toggleVarbit; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java index caee96c3b0..25c26adfc8 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java @@ -68,6 +68,8 @@ public interface Widget */ void setType(int type); + int getButtonType(); + /** * Gets the type of content displayed by the widget. */ @@ -179,6 +181,18 @@ public interface Widget @Deprecated void setRelativeY(int y); + String getSpellName(); + + /** + * You probably want {@link Widget#getText()} instead + */ + String getRSButtonText(); + + /** + * You probably want {@link Widget#getText()} instead + */ + String getButtonText(); + /** * Gets the text displayed on this widget. * @@ -235,6 +249,12 @@ public interface Widget */ String getName(); + /** + * Gets the internal field returned by getName unfiltered + * @return the unfiltered name + */ + String getRSName(); + /** * Sets the name of the widget. * @@ -605,6 +625,8 @@ public interface Widget */ String[] getActions(); + String[] getItemActions(); + /** * Creates a dynamic widget child * @@ -738,15 +760,6 @@ public interface Widget Object[] getOnInvTransmit(); - Object[] getOnOp(); - - /** - * Gets the script and arguments to be ran when one of the listened for inventories changes. - * - * @return - */ - Object[] getOnInvTransmitListener(); - /** * Returns the archive id of the font used * diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 5ecce0340c..7c3476b0ff 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -25,6 +25,10 @@ package net.runelite.api.widgets; /** + + + + * Utility class mapping widget IDs to global constants. *

* The constants defined directly under the {@link WidgetID} class are @@ -171,6 +175,8 @@ public class WidgetID public static final int GENERIC_SCROLL_GROUP_ID = 625; public static final int GAUNTLET_TIMER_GROUP_ID = 637; public static final int GAUNTLET_MAP_GROUP_ID = 638; + public static final int HALLOWED_SEPULCHRE_TIMER_GROUP_ID = 668; + public static final int HEALTH_OVERLAY_BAR_GROUP_ID = 303; static class WorldMap { @@ -320,14 +326,15 @@ public class WidgetID static final int CONTENT_CONTAINER = 9; static final int TAB_CONTAINER = 10; static final int ITEM_CONTAINER = 12; + static final int SCROLLBAR = 13; static final int SEARCH_BUTTON_BACKGROUND = 39; static final int DEPOSIT_INVENTORY = 41; static final int DEPOSIT_EQUIPMENT = 43; static final int INCINERATOR = 45; static final int INCINERATOR_CONFIRM = 46; static final int EQUIPMENT_CONTENT_CONTAINER = 68; - static final int SETTINGS_BUTTON = 108; - static final int EQUIPMENT_BUTTON = 109; + static final int SETTINGS_BUTTON = 111; + static final int EQUIPMENT_BUTTON = 112; } static class GrandExchange @@ -886,23 +893,23 @@ public class WidgetID static class EquipmentWidgetIdentifiers { static final int EQUIP_YOUR_CHARACTER = 3; - static final int STAB_ATTACK_BONUS = 23; - static final int SLASH_ATTACK_BONUS = 24; - static final int CRUSH_ATTACK_BONUS = 25; - static final int MAGIC_ATTACK_BONUS = 26; - static final int RANGED_ATTACK_BONUS = 27; - static final int STAB_DEFENCE_BONUS = 29; - static final int SLASH_DEFENCE_BONUS = 30; - static final int CRUSH_DEFENCE_BONUS = 31; - static final int MAGIC_DEFENCE_BONUS = 32; - static final int RANGED_DEFENCE_BONUS = 33; - static final int MELEE_STRENGTH = 35; - static final int RANGED_STRENGTH = 36; - static final int MAGIC_DAMAGE = 37; - static final int PRAYER_BONUS = 38; - static final int UNDEAD_DAMAGE_BONUS = 40; - static final int SLAYER_DAMAGE_BONUS = 41; - static final int WEIGHT = 43; + static final int STAB_ATTACK_BONUS = 24; + static final int SLASH_ATTACK_BONUS = 25; + static final int CRUSH_ATTACK_BONUS = 26; + static final int MAGIC_ATTACK_BONUS = 27; + static final int RANGED_ATTACK_BONUS = 28; + static final int STAB_DEFENCE_BONUS = 30; + static final int SLASH_DEFENCE_BONUS = 31; + static final int CRUSH_DEFENCE_BONUS = 32; + static final int MAGIC_DEFENCE_BONUS = 33; + static final int RANGED_DEFENCE_BONUS = 34; + static final int MELEE_STRENGTH = 36; + static final int RANGED_STRENGTH = 37; + static final int MAGIC_DAMAGE = 38; + static final int PRAYER_BONUS = 39; + static final int UNDEAD_DAMAGE_BONUS = 41; + static final int SLAYER_DAMAGE_BONUS = 42; + static final int WEIGHT = 49; } static class VarrockMuseum @@ -1152,10 +1159,10 @@ public class WidgetID static final int SKULL = 56; // OUTDATED? static final int ATTACK_RANGE = 59; // OUTDATED? static final int BOUNTY_HUNTER_INFO = 6; - static final int KILLDEATH_RATIO = 34; - static final int SKULL_CONTAINER = 54; - static final int SAFE_ZONE = 56; - static final int WILDERNESS_LEVEL = 59; // this can also be the Deadman Mode "Protection" text + static final int KILLDEATH_RATIO = 28; + static final int SKULL_CONTAINER = 48; + static final int SAFE_ZONE = 50; + static final int WILDERNESS_LEVEL = 53; // this can also be the Deadman Mode "Protection" text } static class KourendFavour @@ -1362,5 +1369,15 @@ public class WidgetID static class GauntletMap { static final int CONTAINER = 4; + } + + static class HallowedSepulchreTimer + { + static final int CONTAINER = 2; + } + + static class EncounterHealthBar + { + static final int CONTAINER = 6; } } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index e6ed83700a..64b38a5a39 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -165,6 +165,7 @@ public enum WidgetInfo BANK_ITEM_COUNT_TOP(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_TOP), BANK_ITEM_COUNT_BAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BAR), BANK_ITEM_COUNT_BOTTOM(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BOTTOM), + BANK_SCROLLBAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.SCROLLBAR), BANK_PIN_CONTAINER(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.CONTAINER), BANK_SETTINGS_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.SETTINGS_BUTTON), BANK_TUTORIAL_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.TUTORIAL_BUTTON), @@ -891,7 +892,11 @@ public enum WidgetInfo SECOND_TRADING_WITH_THEIR_ITEMS(WidgetID.PLAYER_TRADE_CONFIRM_GROUP_ID, WidgetID.TradeScreen.SECOND_THEIR_ITEMS), GAUNTLET_TIMER_CONTAINER(WidgetID.GAUNTLET_TIMER_GROUP_ID, WidgetID.GauntletTimer.CONTAINER), - GAUNTLET_MAP(WidgetID.GAUNTLET_MAP_GROUP_ID, WidgetID.GauntletMap.CONTAINER); + GAUNTLET_MAP(WidgetID.GAUNTLET_MAP_GROUP_ID, WidgetID.GauntletMap.CONTAINER), + + HALLOWED_SEPULCHRE_TIMER_CONTAINER(WidgetID.HALLOWED_SEPULCHRE_TIMER_GROUP_ID, WidgetID.HallowedSepulchreTimer.CONTAINER), + + HEALTH_OVERLAY_BAR(WidgetID.HEALTH_OVERLAY_BAR_GROUP_ID, WidgetID.EncounterHealthBar.CONTAINER); private final int groupId; private final int childId; diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index baf582c674..5c1eead694 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -53,19 +53,19 @@ dependencies { implementation(group = "com.google.inject", name = "guice", version = "4.2.3", classifier = "no_aop") implementation(group = "com.h2database", name = "h2", version = "1.4.200") implementation(group = "com.jakewharton.rxrelay3", name = "rxrelay", version = "3.0.0") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.7.2") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.4") - implementation(group = "net.java.dev.jna", name = "jna", version = "5.5.0") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.8.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.5") + implementation(group = "net.java.dev.jna", name = "jna", version = "5.6.0") implementation(group = "org.jgroups", name = "jgroups", version = "4.2.4.Final") - implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.5.0") + implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.6.0") implementation(group = "net.runelite", name = "discord", version = "1.2") implementation(group = "org.pushing-pixels", name = "radiance-substance", version = "2.5.1") implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4") implementation(group = "org.apache.commons", name = "commons-text", version = "1.8") - implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") - implementation(group = "org.jooq", name = "jooq", version = "3.13.2") - implementation(group = "org.jooq", name = "jooq-codegen", version = "3.13.2") - implementation(group = "org.jooq", name = "jooq-meta", version = "3.13.2") + implementation(group = "org.jetbrains", name = "annotations", version = "20.0.0") + implementation(group = "org.jooq", name = "jooq", version = "3.13.3") + implementation(group = "org.jooq", name = "jooq-codegen", version = "3.13.3") + implementation(group = "org.jooq", name = "jooq-meta", version = "3.13.3") implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.30") implementation(group = "com.github.zafarkhaja", name = "java-semver", version = "0.9.0") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") @@ -87,9 +87,9 @@ dependencies { testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.2.3") testImplementation(group = "org.hamcrest", name = "hamcrest-library", version = "2.2") testImplementation(group = "junit", name = "junit", version = "4.13") - testImplementation(group = "org.mockito", name = "mockito-core", version = "3.3.3") - testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.3.3") - testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.7.2") + testImplementation(group = "org.mockito", name = "mockito-core", version = "3.4.6") + testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.4.6") + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.8.0") testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") } @@ -155,7 +155,7 @@ tasks { register("RuneLite.main()") { group = "openosrs" - classpath = project.sourceSets.main.get().runtimeClasspath + classpath = sourceSets["main"].runtimeClasspath enableAssertions = true main = "net.runelite.client.RuneLite" } diff --git a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java index 5da3ca7e97..1500082b6b 100644 --- a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java @@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.client.eventbus.EventBus; import net.runelite.client.events.ClientShutdown; import net.runelite.client.task.Schedule; +import okhttp3.OkHttpClient; @Singleton @Slf4j @@ -44,9 +45,10 @@ public class ClientSessionManager @Inject - ClientSessionManager(EventBus eventBus) + ClientSessionManager(EventBus eventBus, + OkHttpClient okHttpClient) { - this.sessionClient = new SessionClient(); + this.sessionClient = new SessionClient(okHttpClient); eventBus.subscribe(ClientShutdown.class, this, (e) -> { diff --git a/runelite-client/src/main/java/net/runelite/client/Notifier.java b/runelite-client/src/main/java/net/runelite/client/Notifier.java index ef33478929..2a5a15457e 100644 --- a/runelite-client/src/main/java/net/runelite/client/Notifier.java +++ b/runelite-client/src/main/java/net/runelite/client/Notifier.java @@ -97,7 +97,6 @@ public class Notifier .build(); // Notifier properties - private static final Color FLASH_COLOR = new Color(255, 0, 0, 70); private static final int MINIMUM_FLASH_DURATION_MILLIS = 2000; private static final int MINIMUM_FLASH_DURATION_TICKS = MINIMUM_FLASH_DURATION_MILLIS / Constants.CLIENT_TICK_LENGTH; @@ -214,6 +213,28 @@ public class Notifier FlashNotification flashNotification = runeLiteConfig.flashNotification(); + if (Instant.now().minusMillis(MINIMUM_FLASH_DURATION_MILLIS).isAfter(flashStart)) + { + switch (flashNotification) + { + case FLASH_TWO_SECONDS: + case SOLID_TWO_SECONDS: + flashStart = null; + return; + case SOLID_UNTIL_CANCELLED: + case FLASH_UNTIL_CANCELLED: + // Any interaction with the client since the notification started will cancel it after the minimum duration + if ((client.getMouseIdleTicks() < MINIMUM_FLASH_DURATION_TICKS + || client.getKeyboardIdleTicks() < MINIMUM_FLASH_DURATION_TICKS + || client.getMouseLastPressedMillis() > mouseLastPressedMillis) && clientUI.isFocused()) + { + flashStart = null; + return; + } + break; + } + } + if (client.getGameCycle() % 40 >= 20 // For solid colour, fall through every time. && (flashNotification == FlashNotification.FLASH_TWO_SECONDS @@ -223,32 +244,9 @@ public class Notifier } final Color color = graphics.getColor(); - graphics.setColor(FLASH_COLOR); + graphics.setColor(runeLiteConfig.notificationFlashColor()); graphics.fill(new Rectangle(client.getCanvas().getSize())); graphics.setColor(color); - - if (!Instant.now().minusMillis(MINIMUM_FLASH_DURATION_MILLIS).isAfter(flashStart)) - { - return; - } - - switch (flashNotification) - { - case FLASH_TWO_SECONDS: - case SOLID_TWO_SECONDS: - flashStart = null; - break; - case SOLID_UNTIL_CANCELLED: - case FLASH_UNTIL_CANCELLED: - // Any interaction with the client since the notification started will cancel it after the minimum duration - if ((client.getMouseIdleTicks() < MINIMUM_FLASH_DURATION_TICKS - || client.getKeyboardIdleTicks() < MINIMUM_FLASH_DURATION_TICKS - || client.getMouseLastPressedMillis() > mouseLastPressedMillis) && clientUI.isFocused()) - { - flashStart = null; - } - break; - } } private void sendNotification( diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 748789ebbd..c3ba022e05 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -44,6 +44,10 @@ import java.net.Authenticator; import java.net.PasswordAuthentication; import java.nio.charset.StandardCharsets; import java.nio.file.Paths; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.cert.X509Certificate; import java.util.Locale; import java.util.Map; import java.util.Optional; @@ -52,6 +56,9 @@ import java.util.UUID; import javax.annotation.Nullable; import javax.inject.Provider; import javax.inject.Singleton; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import joptsimple.ArgumentAcceptingOptionSpec; import joptsimple.OptionException; import joptsimple.OptionParser; @@ -102,8 +109,11 @@ import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay; import net.runelite.client.util.Groups; import net.runelite.client.util.WorldUtil; import net.runelite.client.ws.PartyService; +import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldResult; +import okhttp3.Cache; +import okhttp3.OkHttpClient; import org.slf4j.LoggerFactory; @Singleton @@ -118,12 +128,13 @@ public class RuneLite public static final File EXTERNALPLUGIN_DIR = new File(RUNELITE_DIR, "externalmanager"); public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots"); public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs"); - public static final File PLUGINS_DIR = new File(RUNELITE_DIR, "plugins"); public static final File DEFAULT_CONFIG_FILE = new File(RUNELITE_DIR, "runeliteplus.properties"); public static final Locale SYSTEM_LOCALE = Locale.getDefault(); public static boolean allowPrivateServer = false; public static String uuid = UUID.randomUUID().toString(); + private static final int MAX_OKHTTP_CACHE_SIZE = 20 * 1024 * 1024; // 20mb + @Getter private static Injector injector; @@ -239,6 +250,8 @@ public class RuneLite parser.accepts("debug", "Show extra debugging output"); parser.accepts("safe-mode", "Disables external plugins and the GPU plugin"); parser.accepts("no-splash", "Do not show the splash screen"); + parser.accepts("insecure-skip-tls-verification", "Disables TLS verification"); + final ArgumentAcceptingOptionSpec proxyInfo = parser .accepts("proxy") .withRequiredArg().ofType(String.class); @@ -366,7 +379,18 @@ public class RuneLite log.error("Unable to load settings", ex); } - final ClientLoader clientLoader = new ClientLoader(options.valueOf(updateMode)); + final OkHttpClient.Builder okHttpClientBuilder = RuneLiteAPI.CLIENT.newBuilder() + .cache(new Cache(new File(CACHE_DIR, "okhttp"), MAX_OKHTTP_CACHE_SIZE)); + + final boolean insecureSkipTlsVerification = options.has("insecure-skip-tls-verification"); + if (insecureSkipTlsVerification) + { + setupInsecureTrustManager(okHttpClientBuilder); + } + + final OkHttpClient okHttpClient = okHttpClientBuilder.build(); + + final ClientLoader clientLoader = new ClientLoader(okHttpClient, options.valueOf(updateMode)); Completable.fromAction(clientLoader::get) .subscribeOn(Schedulers.computation()) .subscribe(); @@ -401,6 +425,7 @@ public class RuneLite final long start = System.currentTimeMillis(); injector = Guice.createInjector(new RuneLiteModule( + okHttpClient, clientLoader, options.has("safe-mode"), configFile)); @@ -657,4 +682,37 @@ public class RuneLite return f; } } + + private static void setupInsecureTrustManager(OkHttpClient.Builder okHttpClientBuilder) + { + try + { + X509TrustManager trustManager = new X509TrustManager() + { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) + { + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) + { + } + + @Override + public X509Certificate[] getAcceptedIssuers() + { + return new X509Certificate[0]; + } + }; + + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, new TrustManager[]{trustManager}, new SecureRandom()); + okHttpClientBuilder.sslSocketFactory(sc.getSocketFactory(), trustManager); + } + catch (NoSuchAlgorithmException | KeyManagementException ex) + { + log.warn("unable to setup insecure trust manager", ex); + } + } } diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index b7ea65f9a5..04fecbb7cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -58,8 +58,7 @@ import net.runelite.client.task.Scheduler; import net.runelite.client.util.DeferredEventBus; import net.runelite.client.util.ExecutorServiceExceptionLogger; import net.runelite.client.util.NonScheduledExecutorServiceExceptionLogger; -import net.runelite.http.api.RuneLiteAPI; -import okhttp3.Cache; +import net.runelite.http.api.chat.ChatClient; import okhttp3.OkHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,8 +66,7 @@ import org.slf4j.LoggerFactory; @AllArgsConstructor public class RuneLiteModule extends AbstractModule { - private static final int MAX_OKHTTP_CACHE_SIZE = 20 * 1024 * 1024; // 20mb - + private final OkHttpClient okHttpClient; private final Supplier clientLoader; private final boolean safeMode; private final File config; @@ -78,9 +76,7 @@ public class RuneLiteModule extends AbstractModule { bindConstant().annotatedWith(Names.named("safeMode")).to(safeMode); bind(File.class).annotatedWith(Names.named("config")).toInstance(config); - bind(OkHttpClient.class).toInstance(RuneLiteAPI.CLIENT.newBuilder() - .cache(new Cache(new File(RuneLite.CACHE_DIR, "okhttp"), MAX_OKHTTP_CACHE_SIZE)) - .build()); + bind(OkHttpClient.class).toInstance(okHttpClient); bind(MenuManager.class); bind(ChatMessageManager.class); bind(ItemManager.class); @@ -169,4 +165,11 @@ public class RuneLiteModule extends AbstractModule return new NonScheduledExecutorServiceExceptionLogger(executor); } + + @Provides + @Singleton + ChatClient provideChatClient(OkHttpClient okHttpClient) + { + return new ChatClient(okHttpClient); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/SessionClient.java b/runelite-client/src/main/java/net/runelite/client/SessionClient.java index 79245c8c31..a5fb070d61 100644 --- a/runelite-client/src/main/java/net/runelite/client/SessionClient.java +++ b/runelite-client/src/main/java/net/runelite/client/SessionClient.java @@ -28,13 +28,18 @@ import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Observable; import java.io.IOException; import java.util.UUID; +import lombok.AllArgsConstructor; import net.runelite.http.api.RuneLiteAPI; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +@AllArgsConstructor class SessionClient { + private final OkHttpClient okHttpClient; + Observable openSession() { final HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() @@ -47,7 +52,7 @@ class SessionClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = okHttpClient.newCall(request).execute()) { return RuneLiteAPI.GSON.fromJson(response.body().string(), UUID.class); } @@ -67,11 +72,11 @@ class SessionClient .url(url) .build(); - try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) + try (Response response = okHttpClient.newCall(request).execute()) { if (!response.isSuccessful()) { - throw new IOException("Unsuccesful ping"); + throw new IOException("Unsuccessful ping"); } } }); @@ -90,7 +95,7 @@ class SessionClient .url(url) .build(); - RuneLiteAPI.CLIENT.newCall(request).execute().close(); + okHttpClient.newCall(request).execute().close(); }); } -} \ No newline at end of file +} diff --git a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java index aab916d608..1b3b0b1ccf 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java @@ -47,6 +47,7 @@ import net.runelite.client.ws.WSClient; import net.runelite.http.api.account.AccountClient; import net.runelite.http.api.account.OAuthResponse; import net.runelite.http.api.ws.messages.LoginResponse; +import okhttp3.OkHttpClient; @Singleton @Slf4j @@ -59,12 +60,17 @@ public class SessionManager private final EventBus eventBus; private final WSClient wsClient; + private final AccountClient accountClient; @Inject - private SessionManager(EventBus eventBus, WSClient wsClient) + private SessionManager( + EventBus eventBus, + WSClient wsClient, + OkHttpClient okHttpClient) { this.eventBus = eventBus; this.wsClient = wsClient; + this.accountClient = new AccountClient(okHttpClient); this.eventBus.subscribe(LoginResponse.class, this, this::onLoginResponse); } @@ -92,7 +98,7 @@ public class SessionManager } // Check if session is still valid - AccountClient accountClient = new AccountClient(session.getUuid()); + accountClient.setUuid(session.getUuid()); accountClient.sessionCheck() .subscribeOn(Schedulers.io()) .subscribe(b -> @@ -169,10 +175,10 @@ public class SessionManager log.debug("Logging out of account {}", accountSession.getUsername()); - AccountClient client = new AccountClient(accountSession.getUuid()); + accountClient.setUuid(accountSession.getUuid()); try { - client.logout(); + accountClient.logout(); } catch (IOException ex) { @@ -188,13 +194,13 @@ public class SessionManager { // If a session is already open, use that id. Otherwise generate a new id. UUID uuid = wsClient.getSessionId() != null ? wsClient.getSessionId() : UUID.randomUUID(); - AccountClient loginClient = new AccountClient(uuid); + accountClient.setUuid(uuid); final OAuthResponse login; try { - login = loginClient.login(); + login = accountClient.login(); } catch (IOException ex) { diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java index 9d5bca453d..b7072c8887 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java @@ -103,7 +103,7 @@ public interface RuneLiteConfig extends Config keyName = "uiEnableCustomChrome", name = "Enable custom window chrome", description = "Use Runelite's custom window title and borders.", - warning = "Please restart your client after changing this setting", + warning = "Please restart your client after changing this setting.", position = 6, titleSection = "uiTitle" ) @@ -116,8 +116,8 @@ public interface RuneLiteConfig extends Config keyName = "borderless", name = "Windowed borderless", description = "Use windowed borderless mode", - warning = "Please restart your client after changing this setting", - position = 6, // I don't want to change all numbers and this moves it below the other 6, fight me + warning = "Please restart your client after changing this setting.", + position = 7, titleSection = "uiTitle" ) default boolean borderless() @@ -129,7 +129,7 @@ public interface RuneLiteConfig extends Config keyName = "usernameInTitle", name = "Show display name in title", description = "Toggles displaying of local player's display name in client title", - position = 7, + position = 8, titleSection = "uiTitle" ) default boolean usernameInTitle() @@ -141,7 +141,7 @@ public interface RuneLiteConfig extends Config keyName = "miscTitle", name = "Miscellaneous", description = "", - position = 8 + position = 9 ) default Title miscTitle() { @@ -152,7 +152,7 @@ public interface RuneLiteConfig extends Config keyName = "rememberScreenBounds", name = "Remember client position", description = "Save the position and size of the client after exiting", - position = 9, + position = 10, titleSection = "miscTitle" ) default boolean rememberScreenBounds() @@ -164,7 +164,7 @@ public interface RuneLiteConfig extends Config keyName = "gameAlwaysOnTop", name = "Enable client always on top", description = "The game will always be on the top of the screen", - position = 10, + position = 11, titleSection = "miscTitle" ) default boolean gameAlwaysOnTop() @@ -176,7 +176,7 @@ public interface RuneLiteConfig extends Config keyName = "warningOnExit", name = "Display warning on exit", description = "Toggles a warning popup when trying to exit the client", - position = 11, + position = 12, titleSection = "miscTitle" ) default WarningOnExit warningOnExit() @@ -189,7 +189,7 @@ public interface RuneLiteConfig extends Config keyName = "volume", name = "Runelite Volume", description = "Sets the volume of custom Runelite sounds (not the client sounds)", - position = 12, + position = 13, titleSection = "miscTitle" ) @Units(Units.PERCENT) @@ -202,7 +202,7 @@ public interface RuneLiteConfig extends Config keyName = "tooltipPosition", name = "Tooltip Position", description = "Configures whether to show the tooltip above or under the cursor", - position = 13, + position = 14, titleSection = "miscTitle" ) default TooltipPositionType tooltipPosition() @@ -214,7 +214,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationsTitle", name = "Notifications", description = "", - position = 14 + position = 15 ) default Title notificationsTitle() { @@ -225,7 +225,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationTray", name = "Enable tray notifications", description = "Enables tray notifications", - position = 15, + position = 16, titleSection = "notificationsTitle" ) default boolean enableTrayNotifications() @@ -237,7 +237,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationRequestFocus", name = "Request focus on notification", description = "Configures the window focus request type on notification", - position = 16, + position = 17, titleSection = "notificationsTitle" ) default RequestFocusType notificationRequestFocus() @@ -249,7 +249,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationSound", name = "Notification sound", description = "Enables the playing of a beep sound when notifications are displayed", - position = 17, + position = 18, titleSection = "notificationsTitle" ) default Notifier.NativeCustomOff notificationSound() @@ -261,7 +261,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationGameMessage", name = "Enable game message notifications", description = "Puts a notification message in the chatbox", - position = 18, + position = 19, titleSection = "notificationsTitle" ) default boolean enableGameMessageNotification() @@ -273,7 +273,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationFlash", name = "Enable flash notification", description = "Flashes the game frame as a notification", - position = 19, + position = 20, titleSection = "notificationsTitle" ) default FlashNotification flashNotification() @@ -285,7 +285,7 @@ public interface RuneLiteConfig extends Config keyName = "notificationFocused", name = "Send notifications when focused", description = "Toggles all notifications for when the client is focused", - position = 20, + position = 21, titleSection = "notificationsTitle" ) default boolean sendNotificationsWhenFocused() @@ -293,11 +293,24 @@ public interface RuneLiteConfig extends Config return false; } + @Alpha + @ConfigItem( + keyName = "notificationFlashColor", + name = "Notification Flash Color", + description = "Sets the color of the notification flashes.", + position = 22, + titleSection = "notificationsTitle" + ) + default Color notificationFlashColor() + { + return new Color(255, 0, 0, 70); + } + @ConfigTitleSection( keyName = "fontTitle", name = "Font", description = "", - position = 21 + position = 23 ) default Title fontTitle() { @@ -308,7 +321,7 @@ public interface RuneLiteConfig extends Config keyName = "fontType", name = "Dynamic Overlay Font", description = "Configures what font type is used for in-game overlays such as player name, ground items, etc.", - position = 22, + position = 24, titleSection = "fontTitle" ) default FontType fontType() @@ -320,7 +333,7 @@ public interface RuneLiteConfig extends Config keyName = "tooltipFontType", name = "Tooltip Font", description = "Configures what font type is used for in-game tooltips such as food stats, NPC names, etc.", - position = 23, + position = 25, titleSection = "fontTitle" ) default FontType tooltipFontType() @@ -332,7 +345,7 @@ public interface RuneLiteConfig extends Config keyName = "interfaceFontType", name = "Interface Overlay Font", description = "Configures what font type is used for in-game interface overlays such as panels, opponent info, clue scrolls etc.", - position = 24, + position = 26, titleSection = "fontTitle" ) default FontType interfaceFontType() @@ -344,7 +357,7 @@ public interface RuneLiteConfig extends Config keyName = "overlayTitle", name = "Overlays", description = "", - position = 25 + position = 27 ) default Title overlayTitle() { @@ -355,7 +368,7 @@ public interface RuneLiteConfig extends Config keyName = "menuEntryShift", name = "Require Shift for overlay menu", description = "Overlay right-click menu will require shift to be added", - position = 26, + position = 28, titleSection = "overlayTitle" ) default boolean menuEntryShift() @@ -367,7 +380,7 @@ public interface RuneLiteConfig extends Config keyName = "overlayBackgroundColor", name = "Overlay Color", description = "Configures the background color of infoboxes and overlays", - position = 27, + position = 29, titleSection = "overlayTitle" ) @Alpha @@ -380,7 +393,7 @@ public interface RuneLiteConfig extends Config keyName = "infoboxTitle", name = "Infoboxes", description = "", - position = 28 + position = 30 ) default Title infoboxTitle() { @@ -391,7 +404,7 @@ public interface RuneLiteConfig extends Config keyName = "infoBoxVertical", name = "Display infoboxes vertically", description = "Toggles the infoboxes to display vertically", - position = 29, + position = 31, titleSection = "infoboxTitle" ) default boolean infoBoxVertical() @@ -403,7 +416,7 @@ public interface RuneLiteConfig extends Config keyName = "infoBoxSize", name = "Infobox size", description = "Configures the size of each infobox in pixels", - position = 30, + position = 32, titleSection = "infoboxTitle" ) @Units(Units.PIXELS) @@ -416,7 +429,7 @@ public interface RuneLiteConfig extends Config keyName = "keybindsTitle", name = "Key binds", description = "", - position = 31 + position = 33 ) default Title keybindsTitle() { @@ -427,7 +440,7 @@ public interface RuneLiteConfig extends Config keyName = "sidebarToggleKey", name = "Sidebar Toggle Key", description = "The key that will toggle the sidebar (accepts modifiers)", - position = 32, + position = 34, titleSection = "keybindsTitle" ) default Keybind sidebarToggleKey() @@ -439,7 +452,7 @@ public interface RuneLiteConfig extends Config keyName = "panelToggleKey", name = "Plugin Panel Toggle Key", description = "The key that will toggle the current or last opened plugin panel (accepts modifiers)", - position = 33, + position = 35, titleSection = "keybindsTitle" ) default Keybind panelToggleKey() @@ -451,7 +464,7 @@ public interface RuneLiteConfig extends Config keyName = "blockExtraMouseButtons", name = "Block Extra Mouse Buttons", description = "Blocks extra mouse buttons (4 and above)", - position = 34, + position = 36, titleSection = "keybindsTitle" ) default boolean blockExtraMouseButtons() diff --git a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java index 84e0371ba3..3696b65e08 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java +++ b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java @@ -159,6 +159,7 @@ public enum AgilityShortcut MOS_LEHARMLESS_STEPPING_STONE(60, "Stepping Stone", new WorldPoint(3710, 2970, 0), STEPPING_STONE_19042), WINTERTODT_GAP(60, "Gap", new WorldPoint(1629, 4023, 0), GAP_29326), UNGAEL_ICE(60, "Ice Chunks", null, NULL_25337, NULL_29868, NULL_29869, NULL_29870, ICE_CHUNKS_31822, NULL_31823, ICE_CHUNKS_31990), + GWD_LITTLE_CRACK(60, "Little Crack", new WorldPoint(2900, 3712, 0), LITTLE_CRACK), SLAYER_TOWER_MEDIUM_CHAIN_FIRST(61, "Spiked Chain (Floor 1)", new WorldPoint(3421, 3550, 0), SPIKEY_CHAIN), SLAYER_TOWER_MEDIUM_CHAIN_SECOND(61, "Spiked Chain (Floor 2)", new WorldPoint(3420, 3551, 0), SPIKEY_CHAIN_16538), SLAYER_DUNGEON_CREVICE(62, "Narrow Crevice", new WorldPoint(2729, 10008, 0), CREVICE_16539), @@ -184,9 +185,9 @@ public enum AgilityShortcut FOSSIL_ISLAND_HARDWOOD_NORTH(70, "Hole", new WorldPoint(3712, 3828, 0), HOLE_31481, HOLE_31482), FOSSIL_ISLAND_HARDWOOD_SOUTH(70, "Hole", new WorldPoint(3714, 3816, 0), HOLE_31481, HOLE_31482), AL_KHARID_WINDOW(70, "Window", new WorldPoint(3293, 3158, 0), BROKEN_WALL_33344, BIG_WINDOW), - GWD_SARADOMIN_ROPE_NORTH(70, "Rope Descent", new WorldPoint(2912, 5300, 0), NULL_26371), - GWD_SARADOMIN_ROPE_SOUTH(70, "Rope Descent", new WorldPoint(2951, 5267, 0), NULL_26375), - SLAYER_TOWER_ADVANCED_CHAIN_FIRST(71, "Spiked Chain (Floor 2)", new WorldPoint(3447, 3578, 0), SPIKEY_CHAIN), + GWD_SARADOMIN_ROPE_NORTH(70, "Rope Descent", new WorldPoint(2912, 5300, 0), NULL_26371, NULL_26561), + GWD_SARADOMIN_ROPE_SOUTH(70, "Rope Descent", new WorldPoint(2951, 5267, 0), NULL_26375, NULL_26562), + SLAYER_TOWER_ADVANCED_CHAIN_FIRST(71, "Spiked Chain (Floor 2)", new WorldPoint(3447, 3578, 0), SPIKEY_CHAIN ), SLAYER_TOWER_ADVANCED_CHAIN_SECOND(71, "Spiked Chain (Floor 3)", new WorldPoint(3446, 3576, 0), SPIKEY_CHAIN_16538), STRONGHOLD_SLAYER_CAVE_TUNNEL(72, "Tunnel", new WorldPoint(2431, 9806, 0), TUNNEL_30174, TUNNEL_30175), TROLL_STRONGHOLD_WALL_CLIMB(73, "Rocks", new WorldPoint(2841, 3694, 0), ROCKS_16464), diff --git a/runelite-client/src/main/java/net/runelite/client/game/HiscoreManager.java b/runelite-client/src/main/java/net/runelite/client/game/HiscoreManager.java index 060df7d785..9e05b20373 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/HiscoreManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/HiscoreManager.java @@ -33,11 +33,10 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.AllArgsConstructor; import lombok.Data; -import net.runelite.api.Client; -import net.runelite.client.callback.ClientThread; import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreResult; +import okhttp3.OkHttpClient; @Singleton public class HiscoreManager @@ -53,12 +52,13 @@ public class HiscoreManager static final HiscoreResult EMPTY = new HiscoreResult(); static final HiscoreResult NONE = new HiscoreResult(); - private final HiscoreClient hiscoreClient = new HiscoreClient(); private final LoadingCache hiscoreCache; + private final HiscoreClient hiscoreClient; @Inject - public HiscoreManager(Client client, ScheduledExecutorService executor, ClientThread clientThread) + public HiscoreManager(ScheduledExecutorService executor, OkHttpClient okHttpClient) { + hiscoreClient = new HiscoreClient(okHttpClient); hiscoreCache = CacheBuilder.newBuilder() .maximumSize(128L) .expireAfterWrite(1, TimeUnit.HOURS) diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 1ca654bb5b..888531ed6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -48,7 +48,6 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.Constants; import static net.runelite.api.Constants.CLIENT_DEFAULT_ZOOM; -import static net.runelite.api.Constants.HIGH_ALCHEMY_MULTIPLIER; import net.runelite.api.GameState; import net.runelite.api.ItemDefinition; import net.runelite.api.ItemID; @@ -63,11 +62,38 @@ import net.runelite.http.api.item.ItemClient; import net.runelite.http.api.item.ItemPrice; import net.runelite.http.api.item.ItemStats; import org.jetbrains.annotations.NotNull; +import okhttp3.OkHttpClient; @Singleton @Slf4j public class ItemManager { + @Value + private static class ImageKey + { + private final int itemId; + private final int itemQuantity; + private final boolean stackable; + } + + @Value + private static class OutlineKey + { + private final int itemId; + private final int itemQuantity; + private final Color outlineColor; + } + + private final Client client; + private final ClientThread clientThread; + private final ItemClient itemClient; + + private Map itemPrices = Collections.emptyMap(); + private Map itemStats = Collections.emptyMap(); + private final LoadingCache itemImages; + private final LoadingCache itemDefinitions; + private final LoadingCache itemOutlines; + // Worn items with weight reducing property have a different worn and inventory ItemID private static final ImmutableMap WORN_ITEMS = ImmutableMap.builder(). put(BOOTS_OF_LIGHTNESS_89, BOOTS_OF_LIGHTNESS). @@ -136,14 +162,6 @@ public class ItemManager put(AGILITY_CAPET_13341, AGILITY_CAPET). put(AGILITY_CAPE_13340, AGILITY_CAPE). build(); - private final Client client; - private final ClientThread clientThread; - private final ItemClient itemClient; - private final LoadingCache itemImages; - private final LoadingCache itemDefinitions; - private final LoadingCache itemOutlines; - private Map itemPrices = Collections.emptyMap(); - private Map itemStats = Map.of(); @Inject public ItemManager( @@ -151,12 +169,11 @@ public class ItemManager ScheduledExecutorService executor, ClientThread clientThread, EventBus eventbus, - ItemClient itemClient - ) + OkHttpClient okHttpClient) { this.client = client; this.clientThread = clientThread; - this.itemClient = itemClient; + this.itemClient = new ItemClient(okHttpClient); executor.scheduleWithFixedDelay(this::loadPrices, 0, 30, TimeUnit.MINUTES); executor.submit(this::loadStats); @@ -322,7 +339,7 @@ public class ItemManager return 1000; } - return (int) Math.max(1, composition.getPrice() * HIGH_ALCHEMY_MULTIPLIER); + return Math.max(1, composition.getHaPrice()); } public int getAlchValue(int itemID) @@ -336,7 +353,7 @@ public class ItemManager return 1000; } - return (int) Math.max(1, getItemDefinition(itemID).getPrice() * HIGH_ALCHEMY_MULTIPLIER); + return Math.max(1, getItemDefinition(itemID).getHaPrice()); } public int getRepairValue(int itemId) @@ -533,20 +550,4 @@ public class ItemManager return null; } } - - @Value - private static class ImageKey - { - private final int itemId; - private final int itemQuantity; - private final boolean stackable; - } - - @Value - private static class OutlineKey - { - private final int itemId; - private final int itemQuantity; - private final Color outlineColor; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java index 4c111184ab..8105c1ce3c 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java @@ -188,6 +188,8 @@ public enum ItemMapping ITEM_CRAWS_BOW(CRAWS_BOW_U, CRAWS_BOW), ITEM_VIGGORAS_CHAINMACE(VIGGORAS_CHAINMACE_U, VIGGORAS_CHAINMACE), ITEM_THAMMARONS_SCEPTRE(THAMMARONS_SCEPTRE_U, THAMMARONS_SCEPTRE), + ITEM_BRYOPHYTAS_STAFF(BRYOPHYTAS_STAFF_UNCHARGED, BRYOPHYTAS_STAFF), + ITEM_RING_OF_ENDURANCE(RING_OF_ENDURANCE_UNCHARGED, RING_OF_ENDURANCE), // Infinity colour kits ITEM_INFINITY_TOP(INFINITY_TOP, INFINITY_TOP_10605, INFINITY_TOP_20574, DARK_INFINITY_TOP, LIGHT_INFINITY_TOP), diff --git a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java index 62c88cf0d5..39181bb8cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java @@ -53,7 +53,6 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemDespawned; import net.runelite.api.events.ItemQuantityChanged; import net.runelite.api.events.ItemSpawned; -import net.runelite.api.events.NpcDefinitionChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.PlayerDespawned; import net.runelite.client.eventbus.EventBus; @@ -65,26 +64,27 @@ import net.runelite.client.events.PlayerLootReceived; public class LootManager { private static final Map NPC_DEATH_ANIMATIONS = ImmutableMap.builder() - .put(NpcID.CAVE_KRAKEN, AnimationID.CAVE_KRAKEN_DEATH) - .put(NpcID.CRYSTALLINE_BAT, AnimationID.CRYSTALLINE_BAT_DEATH) - .put(NpcID.CRYSTALLINE_RAT, AnimationID.CRYSTALLINE_RAT_DEATH) - .put(NpcID.CRYSTALLINE_SPIDER, AnimationID.CRYSTALLINE_SPIDER_DEATH) - .put(NpcID.CRYSTALLINE_WOLF, AnimationID.CRYSTALLINE_WOLF_DEATH) - .put(NpcID.CRYSTALLINE_UNICORN, AnimationID.CRYSTALLINE_UNICORN_DEATH) - .put(NpcID.CRYSTALLINE_SCORPION, AnimationID.CORRUPTED_SCORPION_DEATH) - .put(NpcID.CRYSTALLINE_DRAGON, AnimationID.CRYSTALLINE_DRAGON_DEATH) - .put(NpcID.CRYSTALLINE_DARK_BEAST, AnimationID.CRYSTALLINE_DARK_BEAST_DEATH) - .put(NpcID.CRYSTALLINE_BEAR, AnimationID.CRYSTALLINE_BEAR_DEATH) - .put(NpcID.CORRUPTED_BAT, AnimationID.CRYSTALLINE_BAT_DEATH) - .put(NpcID.CORRUPTED_RAT, AnimationID.CRYSTALLINE_RAT_DEATH) - .put(NpcID.CORRUPTED_SPIDER, AnimationID.CRYSTALLINE_SPIDER_DEATH) - .put(NpcID.CORRUPTED_WOLF, AnimationID.CRYSTALLINE_WOLF_DEATH) - .put(NpcID.CORRUPTED_UNICORN, AnimationID.CRYSTALLINE_UNICORN_DEATH) - .put(NpcID.CORRUPTED_SCORPION, AnimationID.CORRUPTED_SCORPION_DEATH) - .put(NpcID.CORRUPTED_DRAGON, AnimationID.CRYSTALLINE_DRAGON_DEATH) - .put(NpcID.CORRUPTED_DARK_BEAST, AnimationID.CRYSTALLINE_DARK_BEAST_DEATH) - .put(NpcID.CORRUPTED_BEAR, AnimationID.CRYSTALLINE_BEAR_DEATH) - .build(); + .put(NpcID.CAVE_KRAKEN, AnimationID.CAVE_KRAKEN_DEATH) + .put(NpcID.CRYSTALLINE_BAT, AnimationID.CRYSTALLINE_BAT_DEATH) + .put(NpcID.CRYSTALLINE_RAT, AnimationID.CRYSTALLINE_RAT_DEATH) + .put(NpcID.CRYSTALLINE_SPIDER, AnimationID.CRYSTALLINE_SPIDER_DEATH) + .put(NpcID.CRYSTALLINE_WOLF, AnimationID.CRYSTALLINE_WOLF_DEATH) + .put(NpcID.CRYSTALLINE_UNICORN, AnimationID.CRYSTALLINE_UNICORN_DEATH) + .put(NpcID.CRYSTALLINE_SCORPION, AnimationID.CORRUPTED_SCORPION_DEATH) + .put(NpcID.CRYSTALLINE_DRAGON, AnimationID.CRYSTALLINE_DRAGON_DEATH) + .put(NpcID.CRYSTALLINE_DARK_BEAST, AnimationID.CRYSTALLINE_DARK_BEAST_DEATH) + .put(NpcID.CRYSTALLINE_BEAR, AnimationID.CRYSTALLINE_BEAR_DEATH) + .put(NpcID.CORRUPTED_BAT, AnimationID.CRYSTALLINE_BAT_DEATH) + .put(NpcID.CORRUPTED_RAT, AnimationID.CRYSTALLINE_RAT_DEATH) + .put(NpcID.CORRUPTED_SPIDER, AnimationID.CRYSTALLINE_SPIDER_DEATH) + .put(NpcID.CORRUPTED_WOLF, AnimationID.CRYSTALLINE_WOLF_DEATH) + .put(NpcID.CORRUPTED_UNICORN, AnimationID.CRYSTALLINE_UNICORN_DEATH) + .put(NpcID.CORRUPTED_SCORPION, AnimationID.CORRUPTED_SCORPION_DEATH) + .put(NpcID.CORRUPTED_DRAGON, AnimationID.CRYSTALLINE_DRAGON_DEATH) + .put(NpcID.CORRUPTED_DARK_BEAST, AnimationID.CRYSTALLINE_DARK_BEAST_DEATH) + .put(NpcID.CORRUPTED_BEAR, AnimationID.CRYSTALLINE_BEAR_DEATH) + .put(NpcID.THE_NIGHTMARE_9430, AnimationID.NIGHTMARE_DEATH) + .build(); private final EventBus eventBus; private final Client client; @@ -106,7 +106,6 @@ public class LootManager this.client = client; eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcDefinitionChanged.class, this, this::onNpcChanged); eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); eventBus.subscribe(ItemSpawned.class, this, this::onItemSpawned); @@ -247,6 +246,11 @@ public class LootManager // Big Kraken drops loot wherever player is standing when animation starts. krakenPlayerLocation = client.getLocalPlayer().getWorldLocation(); } + else if (id == NpcID.THE_NIGHTMARE_9430) + { + delayedLootNpc = npc; + delayedLootTickLimit = 16; + } else { // These NPCs drop loot on death animation, which is right now. @@ -255,16 +259,6 @@ public class LootManager } } - private void onNpcChanged(NpcDefinitionChanged npcChanged) - { - final NPC npc = npcChanged.getNpc(); - if (npc.getId() == NpcID.THE_NIGHTMARE_9433) - { - delayedLootNpc = npc; - delayedLootTickLimit = 15; - } - } - private void onGameTick(GameTick gameTick) { if (delayedLootNpc != null && delayedLootTickLimit-- > 0) diff --git a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java index 0659aa46a7..30c8f976a1 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java @@ -34,13 +34,14 @@ import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreResult; import net.runelite.http.api.item.ItemEquipmentStats; import net.runelite.http.api.item.ItemStats; +import okhttp3.OkHttpClient; @Singleton @Slf4j @SuppressWarnings("unused") public class PlayerManager { - private static final HiscoreClient HISCORE_CLIENT = new HiscoreClient(); + private final HiscoreClient hiscoreClient; private final Client client; private final ItemManager itemManager; private final EventBus eventBus; @@ -54,13 +55,16 @@ public class PlayerManager final Client client, final EventBus eventBus, final ItemManager itemManager, - final FriendChatManager friendChatManager + final FriendChatManager friendChatManager, + final OkHttpClient okHttpClient ) { this.client = client; this.itemManager = itemManager; this.eventBus = eventBus; this.friendChatManager = friendChatManager; + this.hiscoreClient = new HiscoreClient(okHttpClient); + eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); eventBus.subscribe(PlayerAppearanceChanged.class, this, this::onAppearenceChanged); @@ -174,7 +178,7 @@ public class PlayerManager { try { - result = HISCORE_CLIENT.lookup(player.getName()); + result = hiscoreClient.lookup(player.getName()); } catch (IOException ex) { diff --git a/runelite-client/src/main/java/net/runelite/client/game/WorldService.java b/runelite-client/src/main/java/net/runelite/client/game/WorldService.java index 51858692cb..7fb9f1992d 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/WorldService.java +++ b/runelite-client/src/main/java/net/runelite/client/game/WorldService.java @@ -43,6 +43,7 @@ import net.runelite.client.util.RunnableExceptionLogger; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldClient; import net.runelite.http.api.worlds.WorldResult; +import okhttp3.OkHttpClient; @Singleton @Slf4j @@ -59,12 +60,15 @@ public class WorldService private WorldResult worlds; @Inject - private WorldService(Client client, ScheduledExecutorService scheduledExecutorService, WorldClient worldClient, - EventBus eventBus) + private WorldService( + Client client, + ScheduledExecutorService scheduledExecutorService, + OkHttpClient okHttpClient, + EventBus eventBus) { this.client = client; this.scheduledExecutorService = scheduledExecutorService; - this.worldClient = worldClient; + this.worldClient = new WorldClient(okHttpClient); this.eventBus = eventBus; scheduledExecutorService.scheduleWithFixedDelay(RunnableExceptionLogger.wrap(this::tick), 0, WORLD_FETCH_TIMER, TimeUnit.MINUTES); diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java index 54fa32a74d..ae6ea6d9fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxItemSearch.java @@ -184,6 +184,11 @@ public class ChatboxItemSearch extends ChatboxTextInput @Override public void keyPressed(KeyEvent ev) { + if (!chatboxPanelManager.shouldTakeInput()) + { + return; + } + switch (ev.getKeyCode()) { case KeyEvent.VK_ENTER: diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java index b928b910dd..a2377e35f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java @@ -200,4 +200,12 @@ public class ChatboxPanelManager { return client.getWidget(WidgetInfo.CHATBOX_CONTAINER); } + + public boolean shouldTakeInput() + { + // the search box on the world map can be focused, and chat input goes there, even + // though the chatbox still has its key listener. + Widget worldMapSearch = client.getWidget(WidgetInfo.WORLD_MAP_SEARCH); + return worldMapSearch == null || client.getVar(VarClientInt.WORLD_MAP_SEARCH_FOCUSED) != 1; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java index 79a330b431..fe7fefc781 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java @@ -609,6 +609,11 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse @Override public void keyTyped(KeyEvent e) { + if (!chatboxPanelManager.shouldTakeInput()) + { + return; + } + char c = e.getKeyChar(); if (charValidator.test(c)) { @@ -628,6 +633,11 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse @Override public void keyPressed(KeyEvent ev) { + if (!chatboxPanelManager.shouldTakeInput()) + { + return; + } + int code = ev.getKeyCode(); if (ev.isControlDown()) { diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java index cb4cc632e5..177df30beb 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextMenuInput.java @@ -178,6 +178,11 @@ public class ChatboxTextMenuInput extends ChatboxInput implements KeyListener @Override public void keyTyped(KeyEvent e) { + if (!chatboxPanelManager.shouldTakeInput()) + { + return; + } + char c = e.getKeyChar(); if (c == '\033') @@ -198,6 +203,11 @@ public class ChatboxTextMenuInput extends ChatboxInput implements KeyListener @Override public void keyPressed(KeyEvent e) { + if (!chatboxPanelManager.shouldTakeInput()) + { + return; + } + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { e.consume(); diff --git a/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java b/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java index b86d317c71..06526149d3 100644 --- a/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java +++ b/runelite-client/src/main/java/net/runelite/client/input/KeyListener.java @@ -24,4 +24,10 @@ */ package net.runelite.client.input; -public interface KeyListener extends java.awt.event.KeyListener {} +public interface KeyListener extends java.awt.event.KeyListener +{ + default boolean isEnabledOnLoginScreen() + { + return false; + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java b/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java index 066f8089c8..b464e2fc84 100644 --- a/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java +++ b/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java @@ -32,7 +32,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.client.util.HotkeyListener; @Singleton public class KeyManager @@ -133,18 +132,13 @@ public class KeyManager return true; } - if (!(keyListener instanceof HotkeyListener)) + final GameState gameState = client.getGameState(); + + if (gameState == GameState.LOGIN_SCREEN || gameState == GameState.LOGIN_SCREEN_AUTHENTICATOR) { - return true; + return keyListener.isEnabledOnLoginScreen(); } - final HotkeyListener hotkeyListener = (HotkeyListener) keyListener; - - if (hotkeyListener.isEnabledOnLogin()) - { - return true; - } - - return client.getGameState() != GameState.LOGIN_SCREEN; + return true; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java index 2f4c368b8c..4d23069d1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java @@ -760,9 +760,9 @@ public class ExternalPluginManager scannedPlugins.add(plugin); } } - catch (NoClassDefFoundError ex) + catch (Throwable ex) { - log.error("plugin {} is outdated", pluginId); + log.error("plugin {} could not be loaded. {} {}", pluginId, ex.toString(), ex.getMessage()); } return scannedPlugins; @@ -930,6 +930,11 @@ public class ExternalPluginManager log.info("Not updating external plugins since there is more than 1 client open"); return; } + else if (developmentMode) + { + log.info("Not updating because we're running in developer mode"); + return; + } RuneLiteSplashScreen.stage(.59, "Updating external plugins"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java index b5a4645cd3..e9cdf90415 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java @@ -619,7 +619,6 @@ public class PluginManager binder.install(plugin); }; Injector pluginInjector = parent.createChildInjector(pluginModule); - pluginInjector.injectMembers(plugin); plugin.injector = pluginInjector; } catch (CreationException ex) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index bb99077714..592b0a07eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -440,8 +440,6 @@ class ConfigPanel extends PluginPanel ConfigDescriptor cd = pluginConfig.getConfigDescriptor(); assert cd != null; - List buttons = new ArrayList<>(); - Map> pluginsInfoMap = externalPluginManager.getPluginsInfoMap(); if (pluginConfig.getPlugin() != null && pluginsInfoMap.containsKey(pluginConfig.getPlugin().getClass().getSimpleName())) @@ -566,28 +564,6 @@ class ConfigPanel extends PluginPanel } } - if (cid.getType() == Button.class) - { - try - { - ConfigItem item = cid.getItem(); - JButton button = new JButton(item.name()); - button.addActionListener((e) -> { - ConfigButtonClicked event = new ConfigButtonClicked(); - event.setGroup(cd.getGroup().value()); - event.setKey(cid.getItem().keyName()); - eventBus.post(ConfigButtonClicked.class, event); - }); - buttons.add(button); - } - catch (Exception ex) - { - log.error("Adding action listener failed: {}", ex.getMessage()); - ex.printStackTrace(); - } - - continue; - } JPanel item = new JPanel(); item.setLayout(new BorderLayout()); item.setMinimumSize(new Dimension(PANEL_WIDTH, 0)); @@ -597,6 +573,28 @@ class ConfigPanel extends PluginPanel configEntryName.setToolTipText("" + name + ":
" + cid.getItem().description() + ""); item.add(configEntryName, cid.getType() != String.class ? BorderLayout.CENTER : BorderLayout.NORTH); + if (cid.getType() == Button.class) + { + try + { + ConfigItem cidItem = cid.getItem(); + JButton button = new JButton(cidItem.name()); + button.addActionListener((e) -> + { + ConfigButtonClicked event = new ConfigButtonClicked(); + event.setGroup(cd.getGroup().value()); + event.setKey(cid.getItem().keyName()); + eventBus.post(ConfigButtonClicked.class, event); + }); + item.add(button); + } + catch (Exception ex) + { + log.error("Adding action listener failed: {}", ex.getMessage()); + ex.printStackTrace(); + } + } + if (cid.getType() == boolean.class) { JCheckBox checkbox = new JCheckBox(); @@ -612,7 +610,8 @@ class ConfigPanel extends PluginPanel item.remove(configEntryName); JButton button = new JButton(cid.getItem().name()); - button.addActionListener((e) -> { + button.addActionListener((e) -> + { log.debug("Running consumer: {}.{}", cd.getGroup().value(), cid.getItem().keyName()); configManager.getConsumer(cd.getGroup().value(), cid.getItem().keyName()).accept(pluginConfig.getPlugin()); }); @@ -1015,8 +1014,6 @@ class ConfigPanel extends PluginPanel } } - buttons.forEach(mainPanel::add); - JButton resetButton = new JButton("Reset"); resetButton.addActionListener((e) -> { @@ -1081,15 +1078,7 @@ class ConfigPanel extends PluginPanel if (!Strings.isNullOrEmpty(configItem.warning())) { - final int result = JOptionPane.showOptionDialog(component, configItem.warning(), - "Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, - null, new String[]{"Yes", "No"}, "No"); - - if (result != JOptionPane.YES_OPTION) - { - rebuild(false); - return; - } + JOptionPane.showMessageDialog(component, configItem.warning(), "Warning", JOptionPane.WARNING_MESSAGE); } if (component instanceof JCheckBox) @@ -1273,4 +1262,4 @@ class ConfigPanel extends PluginPanel { return "" + key + ": " + value + ""; } -} \ No newline at end of file +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java new file mode 100644 index 0000000000..a0e3086b72 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2017, Adam + * 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 net.runelite.client.plugins.xtea; + +import java.io.IOException; +import java.util.HashMap; +import com.google.inject.Provides; +import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Client; +import net.runelite.api.GameState; +import net.runelite.api.events.GameStateChanged; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.http.api.xtea.XteaClient; +import org.apache.commons.lang3.ArrayUtils; +import okhttp3.OkHttpClient; + +@PluginDescriptor( + name = "Xtea", + hidden = true +) +@Slf4j +public class XteaPlugin extends Plugin +{ + @Inject + private XteaClient xteaClient; + + @Inject + private Client client; + + private HashMap xteas; + + @Override + public void startUp() + { + try + { + xteas = xteaClient.get(); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + @Provides + XteaClient provideXteaClient(OkHttpClient okHttpClient) + { + return new XteaClient(okHttpClient); + } + + @Subscribe + private void onGameStateChanged(GameStateChanged gameStateChanged) + { + if (gameStateChanged.getGameState() != GameState.LOGGED_IN) + { + return; + } + + int[] regions = client.getMapRegions(); + int[][] xteaKeys = client.getXteaKeys(); + + for (int idx = 0; idx < regions.length; ++idx) + { + int region = regions[idx]; + int[] keys = xteaKeys[idx]; + + if (xteas.get(region) != null && areKeysEqual(xteas.get(region), keys)) + { + continue; + } + + xteas.put(region, ArrayUtils.toObject(keys)); + + log.info("Submitting region {} keys {}, {}, {}, {}", region, keys[0], keys[1], keys[2], keys[3]); + + //Don't post non encrypted regions + if (keys[0] == 0 && keys[1] == 0 && keys[2] == 0 && keys[3] == 0) + { + continue; + } + + xteaClient.submit(region, keys); + } + } + + private boolean areKeysEqual(Integer[] existingKeys, int[] newKeys) + { + return existingKeys[0] == newKeys[0] && + existingKeys[1] == newKeys[1] && + existingKeys[2] == newKeys[2] && + existingKeys[3] == newKeys[3]; + } +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index 391d2c4a81..691b9844d5 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -28,19 +28,18 @@ package net.runelite.client.rs; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.util.concurrent.TimeUnit; +import lombok.AllArgsConstructor; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +@AllArgsConstructor class ClientConfigLoader { - private ClientConfigLoader() - { - } + private final OkHttpClient okHttpClient; - static RSConfig fetch(HttpUrl url) throws IOException + RSConfig fetch(HttpUrl url) throws IOException { final Request request = new Request.Builder() .url(url) @@ -48,10 +47,6 @@ class ClientConfigLoader final RSConfig config = new RSConfig(); - OkHttpClient okHttpClient = new OkHttpClient.Builder() - .connectTimeout(2000, TimeUnit.MILLISECONDS) - .build(); - try (final Response response = okHttpClient.newCall(request).execute()) { if (!response.isSuccessful()) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 24ac55c37b..2412d8254f 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -40,23 +40,27 @@ import net.runelite.client.RuneLite; import net.runelite.client.ui.RuneLiteSplashScreen; import net.runelite.http.api.worlds.World; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; @Slf4j public class ClientLoader implements Supplier { private static final String CONFIG_URL = "https://oldschool.runescape.com/jav_config.ws"; private static final String BACKUP_CONFIG_URL = "https://raw.githubusercontent.com/open-osrs/hosting/master/jav_config.ws"; - private static final int NUM_ATTEMPTS = 10; - private final ClientUpdateCheckMode updateCheckMode; - private Object client = null; - private WorldSupplier worldSupplier = new WorldSupplier(); + private final ClientConfigLoader clientConfigLoader; + private final ClientUpdateCheckMode updateCheckMode; + private final WorldSupplier worldSupplier; + + private Object client; private RSConfig config; - public ClientLoader(ClientUpdateCheckMode updateCheckMode) + public ClientLoader(OkHttpClient okHttpClient, ClientUpdateCheckMode updateCheckMode) { + this.clientConfigLoader = new ClientConfigLoader(okHttpClient); this.updateCheckMode = updateCheckMode; + this.worldSupplier = new WorldSupplier(okHttpClient); } private static Applet loadRLPlus(final RSConfig config) @@ -178,7 +182,7 @@ public class ClientLoader implements Supplier RuneLiteSplashScreen.stage(.0, "Connecting with gameserver (try " + (attempt + 1) + "/" + NUM_ATTEMPTS + ")"); try { - config = ClientConfigLoader.fetch(url); + config = clientConfigLoader.fetch(url); if (Strings.isNullOrEmpty(config.getCodeBase()) || Strings.isNullOrEmpty(config.getInitialJar()) || Strings.isNullOrEmpty(config.getInitialClass())) { @@ -200,7 +204,7 @@ public class ClientLoader implements Supplier try { - RSConfig backupConfig = ClientConfigLoader.fetch(HttpUrl.parse(BACKUP_CONFIG_URL)); + RSConfig backupConfig = clientConfigLoader.fetch(HttpUrl.parse(BACKUP_CONFIG_URL)); if (Strings.isNullOrEmpty(backupConfig.getCodeBase()) || Strings.isNullOrEmpty(backupConfig.getInitialJar()) || Strings.isNullOrEmpty(backupConfig.getInitialClass()) || Strings.isNullOrEmpty(backupConfig.getRuneLiteWorldParam())) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/WorldSupplier.java b/runelite-client/src/main/java/net/runelite/client/rs/WorldSupplier.java index 6e143b1326..16cf8141ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/WorldSupplier.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/WorldSupplier.java @@ -33,15 +33,18 @@ import java.util.Queue; import java.util.Random; import java.util.function.Supplier; import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.WorldClient; import net.runelite.http.api.worlds.WorldType; +import okhttp3.OkHttpClient; @Slf4j +@RequiredArgsConstructor class WorldSupplier implements Supplier { + private final OkHttpClient okHttpClient; private final Random random = new Random(System.nanoTime()); private Queue worlds = new ArrayDeque<>(); @@ -55,7 +58,7 @@ class WorldSupplier implements Supplier try { - List newWorlds = new WorldClient(RuneLiteAPI.CLIENT) + List newWorlds = new WorldClient(okHttpClient) .lookupWorlds() .getWorlds() .stream() diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 073f33b56c..a38f30308f 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -36,6 +36,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; +import static java.awt.GraphicsDevice.WindowTranslucency.TRANSLUCENT; import java.awt.GraphicsEnvironment; import java.awt.LayoutManager; import java.awt.Rectangle; @@ -54,6 +55,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import javax.inject.Inject; +import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; import javax.swing.BoxLayout; @@ -62,6 +64,7 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JOptionPane; +import static javax.swing.JOptionPane.INFORMATION_MESSAGE; import javax.swing.JPanel; import javax.swing.JRootPane; import javax.swing.SwingUtilities; @@ -99,8 +102,6 @@ import net.runelite.client.util.WinUtil; import org.pushingpixels.substance.internal.SubstanceSynapse; import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities; import org.pushingpixels.substance.internal.utils.SubstanceTitlePaneUtilities; -import static java.awt.GraphicsDevice.WindowTranslucency.TRANSLUCENT; -import static javax.swing.JOptionPane.INFORMATION_MESSAGE; /** * Client UI. @@ -139,7 +140,9 @@ public class ClientUI private final ConfigManager configManager; private final ExecutorService executorService; private final Provider clientThreadProvider; - private final EventBus eventBus; + private final EventBus eventbus; + private final boolean safeMode; + private final CardLayout cardLayout = new CardLayout(); private final Rectangle sidebarButtonPosition = new Rectangle(); private boolean withTitleBar; @@ -167,7 +170,8 @@ public class ClientUI ConfigManager configManager, ExecutorService executorService, Provider clientThreadProvider, - EventBus eventbus) + EventBus eventbus, + @Named("safeMode") boolean safeMode) { this.config = config; this.keyManager = keyManager; @@ -176,7 +180,8 @@ public class ClientUI this.configManager = configManager; this.executorService = executorService; this.clientThreadProvider = clientThreadProvider; - this.eventBus = eventbus; + this.eventbus = eventbus; + this.safeMode = safeMode; eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); eventbus.subscribe(NavigationButtonAdded.class, this, this::onNavigationButtonAdded); @@ -402,7 +407,7 @@ public class ClientUI toggleSidebar(); } }; - sidebarListener.setEnabledOnLogin(true); + sidebarListener.setEnabledOnLoginScreen(true); keyManager.registerKeyListener(sidebarListener); final HotkeyListener pluginPanelListener = new HotkeyListener(config::panelToggleKey) @@ -413,7 +418,7 @@ public class ClientUI togglePluginPanel(); } }; - pluginPanelListener.setEnabledOnLogin(true); + pluginPanelListener.setEnabledOnLoginScreen(true); keyManager.registerKeyListener(pluginPanelListener); // Add mouse listener @@ -532,7 +537,7 @@ public class ClientUI trayIcon = SwingUtil.createTrayIcon(ICON, RuneLiteProperties.getTitle(), frame); // Move frame around (needs to be done after frame is packed) - if (config.rememberScreenBounds()) + if (config.rememberScreenBounds() && !safeMode) { try { @@ -543,8 +548,8 @@ public class ClientUI frame.setBounds(clientBounds); // frame.getGraphicsConfiguration().getBounds() returns the bounds for the primary display. - // We have to find the correct graphics configuration by using the intersection of the client boundaries. - GraphicsConfiguration gc = getIntersectingDisplay(clientBounds); + // We have to find the correct graphics configuration by using the client boundaries. + GraphicsConfiguration gc = findDisplayFromBounds(clientBounds); if (gc != null) { double scale = gc.getDefaultTransform().getScaleX(); @@ -608,7 +613,7 @@ public class ClientUI } } - private GraphicsConfiguration getIntersectingDisplay(final Rectangle bounds) + private GraphicsConfiguration findDisplayFromBounds(final Rectangle bounds) { GraphicsDevice[] gds = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices(); @@ -617,7 +622,7 @@ public class ClientUI GraphicsConfiguration gc = gd.getDefaultConfiguration(); final Rectangle displayBounds = gc.getBounds(); - if (displayBounds.intersects(bounds)) + if (displayBounds.contains(bounds)) { return gc; } @@ -645,7 +650,7 @@ public class ClientUI { saveClientBoundsConfig(); ClientShutdown csev = new ClientShutdown(); - eventBus.post(ClientShutdown.class, csev); + eventbus.post(ClientShutdown.class, csev); executorService.shutdown(); new Thread(() -> diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ThinProgressBar.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ThinProgressBar.java index 85cbb60ebc..80c5207e88 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/ThinProgressBar.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ThinProgressBar.java @@ -61,7 +61,7 @@ public class ThinProgressBar extends JPanel public void setForeground(Color color) { super.setForeground(color); - setBackground(color.darker()); + setBackground(color.darker().darker()); } public void setMaximumValue(int maximumValue) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index f7d9aa21d7..2b1efb53f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -481,53 +481,83 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener if (inOverlayResizingMode) { - final Rectangle r = currentManagedBounds; + final int left = p.x - currentManagedBounds.x; // Distance (in pixels) from the left edge of the bounds + final int top = p.y - currentManagedBounds.y; // Distance (in pixels) from the top edge of the bounds + final int originalX = currentManagedBounds.x; + final int originalY = currentManagedBounds.y; + int x = originalX; + int y = originalY; + int width = currentManagedBounds.width; + int height = currentManagedBounds.height; - final int dx = p.x - r.x; - final int dy = p.y - r.y; switch (clientUI.getCurrentCursor().getType()) { case Cursor.N_RESIZE_CURSOR: - int height = r.height - dy; - r.setRect(r.x, r.y + dy, r.width, height); + y += top; + height -= top; break; case Cursor.NW_RESIZE_CURSOR: - int width = r.width - dx; - height = r.height - dy; - r.setRect(r.x + dx, r.y + dy, width, height); + x += left; + y += top; + width -= left; + height -= top; break; case Cursor.W_RESIZE_CURSOR: - width = r.width - dx; - r.setRect(r.x + dx, r.y, width, r.height); + x += left; + width -= left; break; case Cursor.SW_RESIZE_CURSOR: - width = r.width - dx; - height = dy; - r.setRect(r.x + dx, r.y, width, height); + x += left; + width -= left; + height = top; break; case Cursor.S_RESIZE_CURSOR: - height = dy; - r.setRect(r.x, r.y, r.width, height); + height = top; break; case Cursor.SE_RESIZE_CURSOR: - width = dx; - height = dy; - r.setRect(r.x, r.y, width, height); + width = left; + height = top; break; case Cursor.E_RESIZE_CURSOR: - width = dx; - r.setRect(r.x, r.y, width, r.height); + width = left; break; case Cursor.NE_RESIZE_CURSOR: - width = dx; - height = r.height - dy; - r.setRect(r.x, r.y + dy, width, height); + y += top; + width = left; + height -= top; break; default: // center } - currentManagedOverlay.setPreferredSize(new Dimension(Math.max(MIN_OVERLAY_SIZE, currentManagedBounds.width), Math.max(MIN_OVERLAY_SIZE, currentManagedBounds.height))); + final int widthOverflow = Math.max(0, MIN_OVERLAY_SIZE - width); + final int heightOverflow = Math.max(0, MIN_OVERLAY_SIZE - height); + final int dx = x - originalX; + final int dy = y - originalY; + + // If this resize operation would cause the dimensions to go below the minimum width/height, reset the + // dimensions and adjust the x/y position accordingly as needed + if (widthOverflow > 0) + { + width = MIN_OVERLAY_SIZE; + + if (dx > 0) + { + x -= widthOverflow; + } + } + if (heightOverflow > 0) + { + height = MIN_OVERLAY_SIZE; + + if (dy > 0) + { + y -= heightOverflow; + } + } + + currentManagedBounds.setRect(x, y, width, height); + currentManagedOverlay.setPreferredSize(new Dimension(currentManagedBounds.width, currentManagedBounds.height)); if (currentManagedOverlay.getPreferredLocation() != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java index 87a39ae465..041b6be392 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java @@ -358,7 +358,7 @@ public class OverlayUtil canvasPoint.getY() + yOffset); final Point canvasCenterPoint_shadow = new Point( canvasPoint.getX() + 1, - canvasPoint.getY() + 1); + canvasPoint.getY() + 1 + yOffset); if (shadows) { renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index 99060cbade..d85e675808 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -63,6 +63,8 @@ public class WidgetOverlay extends Overlay .put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_RIGHT) .put(WidgetInfo.THEATRE_OF_BLOOD_HEALTH_ORBS, OverlayPosition.TOP_LEFT) .put(WidgetInfo.GAUNTLET_TIMER_CONTAINER, OverlayPosition.TOP_LEFT) + .put(WidgetInfo.HALLOWED_SEPULCHRE_TIMER_CONTAINER, OverlayPosition.TOP_LEFT) + .put(WidgetInfo.HEALTH_OVERLAY_BAR, OverlayPosition.TOP_CENTER) .build(); public static Collection createOverlays(final Client client) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java index ce22f6df96..6756197705 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java @@ -28,6 +28,7 @@ import com.google.common.collect.ComparisonChain; import java.awt.Graphics; import java.awt.image.BufferedImage; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.Objects; @@ -72,12 +73,12 @@ public class InfoBoxManager synchronized (this) { - int idx = Collections.binarySearch(infoBoxes, infoBox, (b1, b2) -> ComparisonChain + int idx = findInsertionIndex(infoBoxes, infoBox, (b1, b2) -> ComparisonChain .start() .compare(b1.getPriority(), b2.getPriority()) .compare(b1.getPlugin().getName(), b2.getPlugin().getName()) .result()); - infoBoxes.add(idx < 0 ? -idx - 1 : idx, infoBox); + infoBoxes.add(idx, infoBox); } BufferedImage image = infoBox.getImage(); @@ -150,4 +151,38 @@ public class InfoBoxManager } infoBox.setScaledImage(resultImage); } + + /** + * Find insertion point for the given key into the given sorted list. If key already exists in the list, + * return the index after the last occurrence. + * @param list + * @param key + * @param c + * @param + * @return + */ + private static int findInsertionIndex(List list, T key, Comparator c) + { + int idx = Collections.binarySearch(list, key, c); + + if (idx < 0) + { + // key isn't found in the list + return -idx - 1; + } + + // list(idx) is equal to key, so it is not necessary to recheck it + for (int i = idx + 1; i < list.size(); ++i) + { + T cur = list.get(i); + int cmp = c.compare(cur, key); + if (cmp > 0) + { + // this is the first element which is greater + return i; + } + } + + return list.size(); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java index f808fa49f2..1f68a348f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java @@ -39,6 +39,7 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity; +import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.TooltipComponent; @Singleton @@ -103,12 +104,17 @@ public class TooltipOverlay extends Overlay if (tooltip.getComponent() != null) { entity = tooltip.getComponent(); + if (entity instanceof PanelComponent) + { + ((PanelComponent) entity).setBackgroundColor(runeLiteConfig.overlayBackgroundColor()); + } } else { final TooltipComponent tooltipComponent = new TooltipComponent(); tooltipComponent.setModIcons(client.getModIcons()); tooltipComponent.setText(tooltip.getText()); + tooltipComponent.setBackgroundColor(runeLiteConfig.overlayBackgroundColor()); entity = tooltipComponent; } diff --git a/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java b/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java index 57b2297842..be9c938f6f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java +++ b/runelite-client/src/main/java/net/runelite/client/util/HotkeyListener.java @@ -26,7 +26,6 @@ package net.runelite.client.util; import java.awt.event.KeyEvent; import java.util.function.Supplier; -import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import net.runelite.client.config.Keybind; @@ -42,8 +41,13 @@ public abstract class HotkeyListener implements KeyListener private boolean isConsumingTyped = false; @Setter - @Getter - private boolean isEnabledOnLogin = false; + private boolean enabledOnLoginScreen; + + @Override + public boolean isEnabledOnLoginScreen() + { + return enabledOnLoginScreen; + } @Override public void keyTyped(KeyEvent e) diff --git a/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java b/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java index a07e0240bb..1823ca734c 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java @@ -58,6 +58,7 @@ import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; import okhttp3.MediaType; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; @@ -76,6 +77,9 @@ public class ImageCapture @Inject private Notifier notifier; + @Inject + private OkHttpClient okHttpClient; + /** * Saves a screenshot of the client window to the screenshot folder as a PNG, * and optionally uploads it to an image-hosting service. @@ -197,7 +201,7 @@ public class ImageCapture .post(RequestBody.create(JSON, json)) .build(); - RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() + okHttpClient.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException ex) diff --git a/runelite-client/src/main/java/net/runelite/client/util/WeaponMap.java b/runelite-client/src/main/java/net/runelite/client/util/WeaponMap.java index 3e2836db29..9f7e3c20ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/WeaponMap.java +++ b/runelite-client/src/main/java/net/runelite/client/util/WeaponMap.java @@ -9,7 +9,7 @@ public class WeaponMap static { - //Melee + //Melee StyleMap.put(ItemID._3RD_AGE_AXE, WeaponStyle.MELEE); StyleMap.put(ItemID._3RD_AGE_LONGSWORD, WeaponStyle.MELEE); StyleMap.put(ItemID._3RD_AGE_PICKAXE, WeaponStyle.MELEE); @@ -20,6 +20,7 @@ public class WeaponMap StyleMap.put(ItemID.ABYSSAL_DAGGER_P_13271, WeaponStyle.MELEE); StyleMap.put(ItemID.ABYSSAL_TENTACLE, WeaponStyle.MELEE); StyleMap.put(ItemID.ABYSSAL_WHIP, WeaponStyle.MELEE); + StyleMap.put(ItemID.ABYSSAL_WHIP_20405, WeaponStyle.MELEE); StyleMap.put(ItemID.ADAMANT_2H_SWORD, WeaponStyle.MELEE); StyleMap.put(ItemID.ADAMANT_AXE, WeaponStyle.MELEE); StyleMap.put(ItemID.ADAMANT_BATTLEAXE, WeaponStyle.MELEE); @@ -166,6 +167,7 @@ public class WeaponMap StyleMap.put(ItemID.DRAGON_CLAWS, WeaponStyle.MELEE); StyleMap.put(ItemID.DRAGON_CLAWS_20784, WeaponStyle.MELEE); StyleMap.put(ItemID.DRAGON_DAGGER, WeaponStyle.MELEE); + StyleMap.put(ItemID.DRAGON_DAGGER_20407, WeaponStyle.MELEE); StyleMap.put(ItemID.DRAGON_DAGGERP, WeaponStyle.MELEE); StyleMap.put(ItemID.DRAGON_DAGGERP_5680, WeaponStyle.MELEE); StyleMap.put(ItemID.DRAGON_DAGGERP_5698, WeaponStyle.MELEE); @@ -208,6 +210,7 @@ public class WeaponMap StyleMap.put(ItemID.FROZEN_ABYSSAL_WHIP, WeaponStyle.MELEE); StyleMap.put(ItemID.GADDERHAMMER, WeaponStyle.MELEE); StyleMap.put(ItemID.GHRAZI_RAPIER, WeaponStyle.MELEE); + StyleMap.put(ItemID.GHRAZI_RAPIER_23628, WeaponStyle.MELEE); StyleMap.put(ItemID.GILDED_2H_SWORD, WeaponStyle.MELEE); StyleMap.put(ItemID.GILDED_HASTA, WeaponStyle.MELEE); StyleMap.put(ItemID.GILDED_SCIMITAR, WeaponStyle.MELEE); @@ -219,6 +222,8 @@ public class WeaponMap StyleMap.put(ItemID.GRANITE_MAUL, WeaponStyle.MELEE); StyleMap.put(ItemID.GRANITE_MAUL_12848, WeaponStyle.MELEE); StyleMap.put(ItemID.GRANITE_MAUL_20557, WeaponStyle.MELEE); + StyleMap.put(ItemID.GRANITE_MAUL_24225, WeaponStyle.MELEE); + StyleMap.put(ItemID.GRANITE_MAUL_24227, WeaponStyle.MELEE); StyleMap.put(ItemID.GREEN_BANNER, WeaponStyle.MELEE); StyleMap.put(ItemID.GUTHANS_WARSPEAR, WeaponStyle.MELEE); StyleMap.put(ItemID.GUTHANS_WARSPEAR_0, WeaponStyle.MELEE); @@ -227,6 +232,7 @@ public class WeaponMap StyleMap.put(ItemID.GUTHANS_WARSPEAR_50, WeaponStyle.MELEE); StyleMap.put(ItemID.GUTHANS_WARSPEAR_75, WeaponStyle.MELEE); StyleMap.put(ItemID.HALBERD, WeaponStyle.MELEE); + StyleMap.put(ItemID.HAM_JOINT, WeaponStyle.MELEE); StyleMap.put(ItemID.HAND_FAN, WeaponStyle.MELEE); StyleMap.put(ItemID.HILL_GIANT_CLUB, WeaponStyle.MELEE); StyleMap.put(ItemID.HOLY_HANDEGG, WeaponStyle.MELEE); @@ -378,6 +384,8 @@ public class WeaponMap StyleMap.put(ItemID.SNOWBALL, WeaponStyle.MELEE); StyleMap.put(ItemID.SPEAR, WeaponStyle.MELEE); StyleMap.put(ItemID.STALE_BAGUETTE, WeaponStyle.MELEE); + StyleMap.put(ItemID.STATIUSS_WARHAMMER, WeaponStyle.MELEE); + StyleMap.put(ItemID.STATIUSS_WARHAMMER_23620, WeaponStyle.MELEE); StyleMap.put(ItemID.STEEL_2H_SWORD, WeaponStyle.MELEE); StyleMap.put(ItemID.STEEL_AXE, WeaponStyle.MELEE); StyleMap.put(ItemID.STEEL_BATTLEAXE, WeaponStyle.MELEE); @@ -399,6 +407,7 @@ public class WeaponMap StyleMap.put(ItemID.STEEL_WARHAMMER, WeaponStyle.MELEE); StyleMap.put(ItemID.STONE_BOWL, WeaponStyle.MELEE); StyleMap.put(ItemID.SWAMP_LIZARD, WeaponStyle.MELEE); + StyleMap.put(ItemID.SWIFT_BLADE, WeaponStyle.MELEE); StyleMap.put(ItemID.TOKTZXILAK, WeaponStyle.MELEE); StyleMap.put(ItemID.TOKTZXILAK_20554, WeaponStyle.MELEE); StyleMap.put(ItemID.TOKTZXILEK, WeaponStyle.MELEE); @@ -421,6 +430,9 @@ public class WeaponMap StyleMap.put(ItemID.VERACS_FLAIL_75, WeaponStyle.MELEE); StyleMap.put(ItemID.VESTAS_BLIGHTED_LONGSWORD, WeaponStyle.MELEE); StyleMap.put(ItemID.VESTAS_LONGSWORD_INACTIVE, WeaponStyle.MELEE); + StyleMap.put(ItemID.VESTAS_LONGSWORD, WeaponStyle.MELEE); + StyleMap.put(ItemID.VESTAS_LONGSWORD_23615, WeaponStyle.MELEE); + StyleMap.put(ItemID.VESTAS_SPEAR, WeaponStyle.MELEE); StyleMap.put(ItemID.VIGGORAS_CHAINMACE, WeaponStyle.MELEE); StyleMap.put(ItemID.VIGGORAS_CHAINMACE_U, WeaponStyle.MELEE); StyleMap.put(ItemID.VOLCANIC_ABYSSAL_WHIP, WeaponStyle.MELEE); @@ -459,7 +471,7 @@ public class WeaponMap StyleMap.put(ItemID.ZAMORAK_GODSWORD_OR, WeaponStyle.MELEE); StyleMap.put(ItemID.ZOMBIE_HEAD, WeaponStyle.MELEE); - //Ranged + //Ranged StyleMap.put(ItemID._3RD_AGE_BOW, WeaponStyle.RANGE); StyleMap.put(ItemID.ADAMANT_CROSSBOW, WeaponStyle.RANGE); StyleMap.put(ItemID.ADAMANT_DART, WeaponStyle.RANGE); @@ -472,6 +484,7 @@ public class WeaponMap StyleMap.put(ItemID.ADAMANT_KNIFEP_5666, WeaponStyle.RANGE); StyleMap.put(ItemID.ADAMANT_THROWNAXE, WeaponStyle.RANGE); StyleMap.put(ItemID.ARMADYL_CROSSBOW, WeaponStyle.RANGE); + StyleMap.put(ItemID.ARMADYL_CROSSBOW_23611, WeaponStyle.RANGE); StyleMap.put(ItemID.BLACK_CHINCHOMPA, WeaponStyle.RANGE); StyleMap.put(ItemID.BLACK_DART, WeaponStyle.RANGE); StyleMap.put(ItemID.BLACK_DARTP, WeaponStyle.RANGE); @@ -539,6 +552,7 @@ public class WeaponMap StyleMap.put(ItemID.DRAGON_KNIFEP_22810, WeaponStyle.RANGE); StyleMap.put(ItemID.DRAGON_THROWNAXE, WeaponStyle.RANGE); StyleMap.put(ItemID.HEAVY_BALLISTA, WeaponStyle.RANGE); + StyleMap.put(ItemID.HEAVY_BALLISTA_23630, WeaponStyle.RANGE); StyleMap.put(ItemID.HOLY_WATER, WeaponStyle.RANGE); StyleMap.put(ItemID.HUNTERS_CROSSBOW, WeaponStyle.RANGE); StyleMap.put(ItemID.IRON_CROSSBOW, WeaponStyle.RANGE); @@ -578,6 +592,7 @@ public class WeaponMap StyleMap.put(ItemID.MITH_CROSSBOW, WeaponStyle.RANGE); StyleMap.put(ItemID.MONKEY_TALISMAN, WeaponStyle.RANGE); StyleMap.put(ItemID.MORRIGANS_JAVELIN, WeaponStyle.RANGE); + StyleMap.put(ItemID.MORRIGANS_JAVELIN_23619, WeaponStyle.RANGE); StyleMap.put(ItemID.MORRIGANS_THROWING_AXE, WeaponStyle.RANGE); StyleMap.put(ItemID.MUD_PIE, WeaponStyle.RANGE); StyleMap.put(ItemID.NEW_CRYSTAL_BOW, WeaponStyle.RANGE); @@ -589,6 +604,7 @@ public class WeaponMap StyleMap.put(ItemID.RED_CHINCHOMPA, WeaponStyle.RANGE); StyleMap.put(ItemID.RED_CHINCHOMPA_10034, WeaponStyle.RANGE); StyleMap.put(ItemID.RUNE_CROSSBOW, WeaponStyle.RANGE); + StyleMap.put(ItemID.RUNE_CROSSBOW_23601, WeaponStyle.RANGE); StyleMap.put(ItemID.RUNE_DART, WeaponStyle.RANGE); StyleMap.put(ItemID.RUNE_DARTP, WeaponStyle.RANGE); StyleMap.put(ItemID.RUNE_DARTP_5634, WeaponStyle.RANGE); @@ -624,7 +640,7 @@ public class WeaponMap StyleMap.put(ItemID.YEW_LONGBOW, WeaponStyle.RANGE); StyleMap.put(ItemID.YEW_SHORTBOW, WeaponStyle.RANGE); - //Magic + //Magic StyleMap.put(ItemID._3RD_AGE_WAND, WeaponStyle.MAGIC); StyleMap.put(ItemID.AHRIMS_STAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.AHRIMS_STAFF_0, WeaponStyle.MAGIC); @@ -632,6 +648,7 @@ public class WeaponMap StyleMap.put(ItemID.AHRIMS_STAFF_25, WeaponStyle.MAGIC); StyleMap.put(ItemID.AHRIMS_STAFF_50, WeaponStyle.MAGIC); StyleMap.put(ItemID.AHRIMS_STAFF_75, WeaponStyle.MAGIC); + StyleMap.put(ItemID.AHRIMS_STAFF_23653, WeaponStyle.MAGIC); StyleMap.put(ItemID.AIR_BATTLESTAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.ANCIENT_CROZIER, WeaponStyle.MAGIC); StyleMap.put(ItemID.ANCIENT_STAFF, WeaponStyle.MAGIC); @@ -659,6 +676,7 @@ public class WeaponMap StyleMap.put(ItemID.IBANS_STAFF_U, WeaponStyle.MAGIC); StyleMap.put(ItemID.IVANDIS_FLAIL, WeaponStyle.MAGIC); StyleMap.put(ItemID.KODAI_WAND, WeaponStyle.MAGIC); + StyleMap.put(ItemID.KODAI_WAND_23626, WeaponStyle.MAGIC); StyleMap.put(ItemID.LAVA_BATTLESTAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.LAVA_BATTLESTAFF_21198, WeaponStyle.MAGIC); StyleMap.put(ItemID.LUNAR_STAFF, WeaponStyle.MAGIC); @@ -710,10 +728,13 @@ public class WeaponMap StyleMap.put(ItemID.SMOKE_BATTLESTAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF_OF_AIR, WeaponStyle.MAGIC); + StyleMap.put(ItemID.STAFF_OF_BALANCE, WeaponStyle.MAGIC); + StyleMap.put(ItemID.STAFF_OF_BOB_THE_CAT, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF_OF_EARTH, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF_OF_FIRE, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF_OF_LIGHT, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF_OF_THE_DEAD, WeaponStyle.MAGIC); + StyleMap.put(ItemID.STAFF_OF_THE_DEAD_23613, WeaponStyle.MAGIC); StyleMap.put(ItemID.STAFF_OF_WATER, WeaponStyle.MAGIC); StyleMap.put(ItemID.STARTER_STAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.STEAM_BATTLESTAFF, WeaponStyle.MAGIC); @@ -742,7 +763,8 @@ public class WeaponMap StyleMap.put(ItemID.ZAMORAK_CROZIER, WeaponStyle.MAGIC); StyleMap.put(ItemID.ZAMORAK_STAFF, WeaponStyle.MAGIC); StyleMap.put(ItemID.ZURIELS_STAFF, WeaponStyle.MAGIC); - //what the fuck... + StyleMap.put(ItemID.ZURIELS_STAFF_23617, WeaponStyle.MAGIC); + //what the fuck... StyleMap.put(ItemID.GNOMEBALL, WeaponStyle.MAGIC); } } diff --git a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java index c6f75f4fbc..3b6ee1752e 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java @@ -40,6 +40,7 @@ import net.runelite.http.api.ws.WebsocketGsonFactory; import net.runelite.http.api.ws.WebsocketMessage; import net.runelite.http.api.ws.messages.Handshake; import net.runelite.http.api.ws.messages.party.PartyMessage; +import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.WebSocket; @@ -50,6 +51,7 @@ import okhttp3.WebSocketListener; public class WSClient extends WebSocketListener implements AutoCloseable { private final EventBus eventBus; + private final OkHttpClient okHttpClient; private final Collection> messages = new HashSet<>(); private volatile Gson gson; @@ -58,9 +60,10 @@ public class WSClient extends WebSocketListener implements AutoCloseable private WebSocket webSocket; @Inject - private WSClient(EventBus eventBus) + private WSClient(EventBus eventBus, OkHttpClient okHttpClient) { this.eventBus = eventBus; + this.okHttpClient = okHttpClient; this.gson = WebsocketGsonFactory.build(WebsocketGsonFactory.factory(messages)); } @@ -101,7 +104,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable .url(RuneLiteAPI.getWsEndpoint()) .build(); - webSocket = RuneLiteAPI.CLIENT.newWebSocket(request, this); + webSocket = okHttpClient.newWebSocket(request, this); Handshake handshake = new Handshake(); handshake.setSession(sessionId); diff --git a/runelite-client/src/main/resources/logback.xml b/runelite-client/src/main/resources/logback.xml index 87ea8ef5a9..1d5dfa9355 100644 --- a/runelite-client/src/main/resources/logback.xml +++ b/runelite-client/src/main/resources/logback.xml @@ -68,6 +68,6 @@ - + \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankSearchFilter.rs2asm b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm index 5f9db325af..0555737bdb 100644 --- a/runelite-client/src/main/scripts/BankSearchFilter.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm @@ -19,6 +19,15 @@ LABEL8: string_length iconst 0 if_icmpgt LABEL15 + ; this is a bank search with no input string. the bank tag plugin uses it to perform its tab searches. + iconst 1 ; return value - default to true to match anything + iload 0 ; load item id + sconst "" ; we are not searching, so there is no search string + sconst "bankSearchFilter" ; push event name + runelite_callback ; invoke callback + pop_int ; pop item id + pop_string ; pop search string + return ; return rv jump LABEL34 LABEL15: iload 0 @@ -32,13 +41,11 @@ LABEL19: sstore 0 iconst -1 ; load return value iload 0 ; load item id - sload 0 ; load item name sload 1 ; load search string sconst "bankSearchFilter" ; push event name runelite_callback ; invoke callback pop_int ; pop item id pop_string ; pop search string - pop_string ; pop item name istore 1 ; store return value for the below comparisons iload 1 iconst 0 diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index a33a83feb4..8a926db3d3 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -10,9 +10,6 @@ ; callback "setBankScroll" ; Fired before bank is calculated ; Used by the TabInterface to show fake bank items for tag tabs -; -; callback "isTabMenuActive" -; Used by the TabInterface to skip setting the bank title sconst "beforeBankLayout" runelite_callback get_varbit 5102 @@ -823,8 +820,6 @@ LABEL725: jump LABEL729 LABEL726: sconst "The Bank of Gielinor" - sconst "setBankTitle" ; - runelite_callback ; iload 5 if_settext LABEL729: @@ -970,12 +965,6 @@ LABEL848: add istore 20 jump LABEL769 -SetTitle: - iconst 0 ; Compare variable - iconst 0 ; - sconst "isTabMenuActive" - runelite_callback ; skip setting the bank title if the tag tab menu is active - if_icmpne FinishBuilding LABEL853: get_varbit 4170 iconst 2 @@ -989,8 +978,6 @@ LABEL857: get_varbit 4150 enum join_string 2 - sconst "setBankTitle" ; - runelite_callback ; iload 5 if_settext jump LABEL873 @@ -999,8 +986,6 @@ LABEL867: get_varbit 4150 tostring join_string 2 - sconst "setBankTitle" ; - runelite_callback ; iload 5 if_settext FinishBuilding: diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index 48c9a04fa5..999be92d27 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java @@ -58,6 +58,7 @@ import net.runelite.client.config.ConfigItem; import net.runelite.client.eventbus.AccessorGenerator; import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.Subscribe; +import okhttp3.OkHttpClient; import org.junit.After; import static org.junit.Assert.assertEquals; import org.junit.Before; @@ -66,6 +67,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; +import static org.mockito.Mockito.*; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @@ -92,10 +94,12 @@ public class PluginManagerTest @Before public void before() throws IOException { + OkHttpClient okHttpClient = mock(OkHttpClient.class); + executorService = Executors.newSingleThreadScheduledExecutor(); Injector injector = Guice.createInjector(Modules - .override(new RuneLiteModule(() -> null, false, RuneLite.DEFAULT_CONFIG_FILE)) + .override(new RuneLiteModule(okHttpClient, () -> null, false, RuneLite.DEFAULT_CONFIG_FILE)) .with(BoundFieldModule.of(this))); RuneLite.setInjector(injector); @@ -157,7 +161,7 @@ public class PluginManagerTest { List modules = new ArrayList<>(); modules.add(new GraphvizModule()); - modules.add(new RuneLiteModule(() -> null, false, RuneLite.DEFAULT_CONFIG_FILE)); + modules.add(new RuneLiteModule(mock(OkHttpClient.class), () -> null, false, RuneLite.DEFAULT_CONFIG_FILE)); PluginManager pluginManager = new PluginManager(false, null, null, executorService, null, null, null, null); pluginManager.loadCorePlugins(); diff --git a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java index 677d72ced2..e56eb76740 100644 --- a/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java +++ b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import okhttp3.OkHttpClient; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.After; @@ -63,7 +64,7 @@ public class ClientConfigLoaderTest @Test public void testFetch() throws IOException { - final RSConfig config = ClientConfigLoader.fetch(server.url("/")); + final RSConfig config = new ClientConfigLoader(new OkHttpClient()).fetch(server.url("/")); assertEquals("http://oldschool1.runescape.com/", config.getCodeBase()); } diff --git a/runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java b/runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java index 641536ce8a..a2eb380d3f 100644 --- a/runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java @@ -41,6 +41,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) @@ -65,16 +66,31 @@ public class InfoBoxManagerTest private static class TestInfobox extends InfoBox { - public TestInfobox(InfoBoxPriority infoBoxPriority) + private static final Plugin PLUGIN = mock(Plugin.class); + + static { - super(null, mock(Plugin.class)); + when(PLUGIN.getName()).thenReturn(""); + } + + private final String text; + + private TestInfobox(InfoBoxPriority infoBoxPriority) + { + this(infoBoxPriority, null); + } + + private TestInfobox(InfoBoxPriority infoBoxPriority, String text) + { + super(null, PLUGIN); setPriority(infoBoxPriority); + this.text = text; } @Override public String getText() { - return null; + return text; } @Override @@ -94,4 +110,17 @@ public class InfoBoxManagerTest List order = infoBoxManager.getInfoBoxes().stream().map(InfoBox::getPriority).collect(Collectors.toList()); assertEquals(Arrays.asList(InfoBoxPriority.HIGH, InfoBoxPriority.MED, InfoBoxPriority.LOW), order); } -} + + @Test + public void testSamePluginAndPriority() + { + infoBoxManager.addInfoBox(new TestInfobox(InfoBoxPriority.MED, "one")); + infoBoxManager.addInfoBox(new TestInfobox(InfoBoxPriority.MED, "two")); + infoBoxManager.addInfoBox(new TestInfobox(InfoBoxPriority.MED, "three")); + + assertEquals(3, infoBoxManager.getInfoBoxes().size()); + assertEquals("one", infoBoxManager.getInfoBoxes().get(0).getText()); + assertEquals("two", infoBoxManager.getInfoBoxes().get(1).getText()); + assertEquals("three", infoBoxManager.getInfoBoxes().get(2).getText()); + } +} \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java index 54f3b75b8a..9302bacd3c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java @@ -100,10 +100,8 @@ public abstract class EntityHiderMixin implements RSScene private static boolean hideDeadNPCs; @Copy("newGameObject") - abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity entity, int var10, boolean var11, long var12, int var13); - @Replace("newGameObject") - boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity entity, int var10, boolean var11, long var12, int var13) + boolean copy$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSEntity entity, int var10, boolean var11, long var12, int var13) { final boolean shouldDraw = shouldDraw(entity, false); @@ -119,21 +117,16 @@ public abstract class EntityHiderMixin implements RSScene } return shouldDraw && - addEntityMarker(var1, var2, var3, var4, var5, x, y, var8, entity, var10, var11, var12, var13); + copy$addEntityMarker(var1, var2, var3, var4, var5, x, y, var8, entity, var10, var11, var12, var13); } @Copy("drawActor2d") - private static void draw2DExtras(RSActor actor, int var1, int var2, int var3, int var4, int var5) - { - throw new RuntimeException(); - } - @Replace("drawActor2d") - private static void rl$draw2DExtras(RSActor actor, int var1, int var2, int var3, int var4, int var5) + private static void copy$draw2DExtras(RSActor actor, int var1, int var2, int var3, int var4, int var5) { if (shouldDraw(actor, true)) { - draw2DExtras(actor, var1, var2, var3, var4, var5); + copy$draw2DExtras(actor, var1, var2, var3, var4, var5); } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java index e7698c2b30..d4afe0570c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java @@ -37,7 +37,7 @@ public abstract class ProcessClientErrorMixin implements RSClient private static RSClient client; @Replace("RunException_sendStackTrace") - static void rl$processClientError(String string, Throwable throwable) + static void processClientError(String string, Throwable throwable) { if (throwable != null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java index 89642eeb10..97ab92c821 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java @@ -33,13 +33,12 @@ public abstract class RSAbstractArchiveMixin implements RSAbstractArchive return overlayOutdated; } + @SuppressWarnings("InfiniteRecursion") @Copy("takeFile") - abstract byte[] rs$getConfigData(int archiveId, int fileId); - @Replace("takeFile") - public byte[] rl$getConfigData(int groupId, int fileId) + public byte[] copy$getConfigData(int groupId, int fileId) { - final byte[] rsData = rs$getConfigData(groupId, fileId); + final byte[] rsData = copy$getConfigData(groupId, fileId); final int archiveId = ((RSArchive) this).getIndex(); if (!OverlayIndex.hasOverlay(archiveId, groupId)) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java index a9e854a09a..8303b8f218 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java @@ -35,9 +35,9 @@ import net.runelite.api.Sprite; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ActorDeath; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.HitsplatApplied; -import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.OverheadTextChanged; @@ -247,12 +247,10 @@ public abstract class RSActorMixin implements RSActor { if (healthRatio == 0) { - if (this instanceof Player) - { - final PlayerDeath event = new PlayerDeath((Player) this); - client.getCallbacks().post(PlayerDeath.class, event); - } - else if (this instanceof RSNPC) + final ActorDeath event = new ActorDeath(this); + client.getCallbacks().post(ActorDeath.class, event); + + if (this instanceof RSNPC) { ((RSNPC) this).setDead(true); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSBufferMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSBufferMixin.java index 550361ee7b..9cbf1dfb24 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSBufferMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSBufferMixin.java @@ -42,16 +42,15 @@ public abstract class RSBufferMixin implements RSBuffer private static BigInteger modulus; @Copy("encryptRsa") - abstract void rs$encryptRsa(BigInteger var1, BigInteger var2); - @Replace("encryptRsa") - public void rl$encryptRsa(BigInteger exp, BigInteger mod) + @SuppressWarnings("InfiniteRecursion") + public void copy$encryptRsa(BigInteger exp, BigInteger mod) { if (modulus != null) { mod = modulus; } - rs$encryptRsa(exp, mod); + copy$encryptRsa(exp, mod); } } \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 24a4c20bda..14779ea545 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -957,15 +957,11 @@ public abstract class RSClientMixin implements RSClient } @Copy("runWidgetOnLoadListener") - public static void rs$runWidgetOnLoadListener(int groupId) - { - throw new RuntimeException(); - } - @Replace("runWidgetOnLoadListener") - public static void rl$runWidgetOnLoadListener(int groupId) + @SuppressWarnings("InfiniteRecursion") + public static void copy$runWidgetOnLoadListener(int groupId) { - rs$runWidgetOnLoadListener(groupId); + copy$runWidgetOnLoadListener(groupId); RSWidget[][] widgets = client.getWidgets(); boolean loaded = widgets != null && widgets[groupId] != null; @@ -1024,7 +1020,7 @@ public abstract class RSClientMixin implements RSClient @Inject public static void boostedSkillLevelsChanged(int idx) { - if (idx == 0) + if (idx == -1) { return; } @@ -1147,19 +1143,14 @@ public abstract class RSClientMixin implements RSClient } @Copy("findItemDefinitions") - public static void rs$findItemDefinitions(String var0, boolean var1) - { - throw new RuntimeException(); - } - @Replace("findItemDefinitions") - public static void rl$findItemDefinitions(String var0, boolean var1) + public static void copy$findItemDefinitions(String var0, boolean var1) { GrandExchangeSearched event = new GrandExchangeSearched(); client.getCallbacks().post(GrandExchangeSearched.class, event); if (!event.isConsumed()) { - rs$findItemDefinitions(var0, var1); + copy$findItemDefinitions(var0, var1); } } @@ -1379,13 +1370,8 @@ public abstract class RSClientMixin implements RSClient } @Copy("menuAction") - static void rs$menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) - { - throw new RuntimeException(); - } - @Replace("menuAction") - static void rl$menuAction(int param0, int param1, int opcode, int id, String option, String target, int canvasX, int canvasY) + static void copy$menuAction(int param0, int param1, int opcode, int id, String option, String target, int canvasX, int canvasY) { boolean authentic = true; if (target != null && target.startsWith("!AUTHENTIC")) @@ -1429,7 +1415,7 @@ public abstract class RSClientMixin implements RSClient return; } - rs$menuAction(menuOptionClicked.getParam0(), menuOptionClicked.getParam1(), menuOptionClicked.getOpcode(), + copy$menuAction(menuOptionClicked.getParam0(), menuOptionClicked.getParam1(), menuOptionClicked.getOpcode(), menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), canvasX, canvasY); } @@ -1697,15 +1683,11 @@ public abstract class RSClientMixin implements RSClient } @Copy("shouldLeftClickOpenMenu") - boolean rs$shouldLeftClickOpenMenu() - { - throw new RuntimeException(); - } - @Replace("shouldLeftClickOpenMenu") - boolean rl$shouldLeftClickOpenMenu() + @SuppressWarnings("InfiniteRecursion") + boolean copy$shouldLeftClickOpenMenu() { - if (rs$shouldLeftClickOpenMenu()) + if (copy$shouldLeftClickOpenMenu()) { return true; } @@ -1729,20 +1711,15 @@ public abstract class RSClientMixin implements RSClient } @Copy("menu") - void rs$menu() - { - throw new RuntimeException(); - } - @Replace("menu") - void rl$menu() + void copy$menu() { Menu menu = Menu.MENU; menu.reset(); getCallbacks().post(Menu.class, menu); if (menu.shouldRun()) { - rs$menu(); + copy$menu(); } } @@ -1810,14 +1787,11 @@ public abstract class RSClientMixin implements RSClient } @Copy("forceDisconnect") - static void rs$forceDisconnect(int reason) - { - } - @Replace("forceDisconnect") - static void forceDisconnect(int reason) + @SuppressWarnings("InfiniteRecursion") + static void copy$forceDisconnect(int reason) { - rs$forceDisconnect(reason); + copy$forceDisconnect(reason); if (hideDisconnect && reason == 1) { @@ -1844,15 +1818,11 @@ public abstract class RSClientMixin implements RSClient @Copy("changeGameOptions") - public static void rs$changeGameOptions(int var0) - { - throw new RuntimeException(); - } - @Replace("changeGameOptions") - public static void changeGameOptions(int var0) + @SuppressWarnings("InfiniteRecursion") + public static void copy$changeGameOptions(int var0) { - rs$changeGameOptions(var0); + copy$changeGameOptions(var0); int type = client.getVarpDefinition(var0).getType(); if (type == 3 || type == 4 || type == 10) @@ -1862,8 +1832,8 @@ public abstract class RSClientMixin implements RSClient } } - @Replace("getWidgetClickMask") - public static int getWidgetClickMask(Widget widget) + @Replace("getWidgetFlags") + public static int getWidgetFlags(Widget widget) { IntegerNode integerNode = (IntegerNode) client.getWidgetFlags().get(((long) widget.getId() << 32) + (long) widget.getIndex()); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java index 6d6ba9711f..ed363b4bb0 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java @@ -46,11 +46,10 @@ public abstract class RSDynamicObjectMixin implements RSDynamicObject @Inject public int animationID; + @SuppressWarnings("InfiniteRecursion") @Copy("getModel") - public abstract RSModel rs$getModel(); - @Replace("getModel") - public RSModel rl$getModel() + public RSModel copy$getModel() { try { @@ -61,7 +60,7 @@ public abstract class RSDynamicObjectMixin implements RSDynamicObject { setAnimFrame((animFrame ^ Integer.MIN_VALUE) & 0xFFFF); } - return rs$getModel(); + return copy$getModel(); } finally { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java index 3b67f70a73..36f134b1ac 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java @@ -33,6 +33,7 @@ import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Shadow; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSItemContainer; +import net.runelite.rs.api.RSNodeHashTable; @Mixin(RSItemContainer.class) public abstract class RSItemContainerMixin implements RSItemContainer @@ -129,13 +130,28 @@ public abstract class RSItemContainerMixin implements RSItemContainer int changedId = idx - 1 & 31; int containerId = changedItemContainers[changedId]; - RSItemContainer changedContainer = (RSItemContainer) client.getItemContainers().get(containerId); + RSNodeHashTable itemContainers = client.getItemContainers(); + + RSItemContainer changedContainer = (RSItemContainer) itemContainers.get(containerId); + RSItemContainer changedContainerInvOther = (RSItemContainer) itemContainers.get(containerId | 0x8000); if (changedContainer != null) { ItemContainerChanged event = new ItemContainerChanged(containerId, changedContainer); client.getCallbacks().postDeferred(ItemContainerChanged.class, event); } + + if (changedContainerInvOther != null) + { + ItemContainerChanged event = new ItemContainerChanged(containerId | 0x8000, changedContainerInvOther); + client.getCallbacks().postDeferred(ItemContainerChanged.class, event); + } } } -} \ No newline at end of file + + @Inject + public int size() + { + return getItemIds().length; + } +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java index b0d67ee943..59ec61453b 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java @@ -52,12 +52,10 @@ public abstract class RSItemDefinitionMixin implements RSItemDefinition } @Copy("getShiftClickIndex") - abstract int rs$getShiftClickActionIndex(); - @Replace("getShiftClickIndex") - public int getShiftClickActionIndex() + public int copy$getShiftClickActionIndex() { - return shiftClickActionIndex == DEFAULT_CUSTOM_SHIFT_CLICK_INDEX ? rs$getShiftClickActionIndex() : shiftClickActionIndex; + return shiftClickActionIndex == DEFAULT_CUSTOM_SHIFT_CLICK_INDEX ? copy$getShiftClickActionIndex() : shiftClickActionIndex; } @Inject @@ -77,16 +75,22 @@ public abstract class RSItemDefinitionMixin implements RSItemDefinition } @Copy("getModel") - public abstract RSModel rs$getModel(int quantity); - @Replace("getModel") - public RSModel getModel(int quantity) + public RSModel copy$getModel(int quantity) { if (modelOverride == -1) { - return rs$getModel(quantity); + return copy$getModel(quantity); } return client.getRSItemDefinition(modelOverride).getModel(quantity); } + + @Inject + @Override + public int getHaPrice() + { + int price = getPrice(); + return (int) ((float) price * 0.6f); + } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyHandlerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyHandlerMixin.java index d5e4a71392..a3192bac8c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyHandlerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSKeyHandlerMixin.java @@ -18,45 +18,39 @@ public abstract class RSKeyHandlerMixin implements RSKeyHandler @Shadow("client") private static RSClient client; - @Copy("keyPressed") - abstract void rs$keyPressed(KeyEvent keyEvent); - - @Copy("keyReleased") - abstract void rs$keyReleased(KeyEvent keyEvent); - - @Copy("keyTyped") - abstract void rs$keyTyped(KeyEvent keyEvent); - @Override + @Copy("keyPressed") @Replace("keyPressed") public final synchronized void keyPressed(KeyEvent keyEvent) { client.getCallbacks().keyPressed(keyEvent); if (!keyEvent.isConsumed()) { - rs$keyPressed(keyEvent); + keyPressed(keyEvent); } } @Override + @Copy("keyReleased") @Replace("keyReleased") public final synchronized void keyReleased(KeyEvent keyEvent) { client.getCallbacks().keyReleased(keyEvent); if (!keyEvent.isConsumed()) { - rs$keyReleased(keyEvent); + keyReleased(keyEvent); } } @Override + @Copy("keyTyped") @Replace("keyTyped") public final void keyTyped(KeyEvent keyEvent) { client.getCallbacks().keyTyped(keyEvent); if (!keyEvent.isConsumed()) { - rs$keyTyped(keyEvent); + keyTyped(keyEvent); } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSLoginScreenAnimationMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSLoginScreenAnimationMixin.java index 9cbce63056..fa6863fd24 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSLoginScreenAnimationMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSLoginScreenAnimationMixin.java @@ -38,17 +38,12 @@ public abstract class RSLoginScreenAnimationMixin implements RSLoginScreenAnimat private static RSClient client; @Copy("draw") - void rs$draw(int var1, int var2) - { - throw new RuntimeException(); - } - @Replace("draw") - void rl$draw(int var1, int var2) + void copy$draw(int var1, int var2) { if (client.shouldRenderLoginScreenFire()) { - rs$draw(var1, var2); + copy$draw(var1, var2); } } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java index 4799573d1b..143b4dbcbd 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelDataMixin.java @@ -47,14 +47,13 @@ public abstract class RSModelDataMixin implements RSModelData private float[][] faceTextureVCoordinates; @Copy("toModel") - public abstract Model rs$light(int ambient, int contrast, int var3, int var4, int var5); - @Replace("toModel") - public Model rl$light(int ambient, int contrast, int var3, int var4, int var5) + @SuppressWarnings("InfiniteRecursion") + public Model copy$light(int ambient, int contrast, int var3, int var4, int var5) { client.getLogger().trace("Lighting model {}", this); - Model model = rs$light(ambient, contrast, var3, var4, var5); + Model model = copy$light(ambient, contrast, var3, var4, var5); if (model == null) { return null; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java index 3084faa903..ed08f47adc 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java @@ -160,13 +160,12 @@ public abstract class RSModelMixin implements RSModel } @Copy("contourGround") - public abstract Model rs$contourGround(int[][] tileHeights, int packedX, int height, int packedY, boolean copy, int contouredGround); - @Replace("contourGround") - public Model rl$contourGround(int[][] tileHeights, int packedX, int height, int packedY, boolean copy, int contouredGround) + @SuppressWarnings("InfiniteRecursion") + public Model copy$contourGround(int[][] tileHeights, int packedX, int height, int packedY, boolean copy, int contouredGround) { // With contouredGround >= 0 lighted models are countoured, so we need to copy uvs - Model model = rs$contourGround(tileHeights, packedX, height, packedY, copy, contouredGround); + Model model = copy$contourGround(tileHeights, packedX, height, packedY, copy, contouredGround); if (model != null && model != this) { RSModel rsModel = (RSModel) model; @@ -177,15 +176,13 @@ public abstract class RSModelMixin implements RSModel } @Copy("drawFace") - public abstract void rs$drawFace(int face); - @Replace("drawFace") - public void rl$drawFace(int face) + public void copy$drawFace(int face) { DrawCallbacks callbacks = client.getDrawCallbacks(); if (callbacks == null || !callbacks.drawFace(this, face)) { - rs$drawFace(face); + copy$drawFace(face); } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseHandlerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseHandlerMixin.java index 5a1ba9d01a..1f3bb83205 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseHandlerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseHandlerMixin.java @@ -18,28 +18,8 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler @Inject private int isInEvent; - @Copy("mousePressed") - abstract void rs$mousePressed(MouseEvent mouseEvent); - - @Copy("mouseReleased") - abstract void rs$mouseReleased(MouseEvent mouseEvent); - - @Copy("mouseClicked") - abstract void rs$mouseClicked(MouseEvent mouseEvent); - - @Copy("mouseEntered") - abstract void rs$mouseEntered(MouseEvent mouseEvent); - - @Copy("mouseExited") - abstract void rs$mouseExited(MouseEvent mouseEvent); - - @Copy("mouseDragged") - abstract void rs$mouseDragged(MouseEvent mouseEvent); - - @Copy("mouseMoved") - abstract void rs$mouseMoved(MouseEvent mouseEvent); - @Override + @Copy("mousePressed") @Replace("mousePressed") public synchronized void mousePressed(MouseEvent mouseEvent) { @@ -52,7 +32,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler isInEvent++; try { - rs$mousePressed(mouseEvent); + mousePressed(mouseEvent); } finally { @@ -62,6 +42,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler } @Override + @Copy("mouseReleased") @Replace("mouseReleased") public synchronized void mouseReleased(MouseEvent mouseEvent) { @@ -74,7 +55,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler isInEvent++; try { - rs$mouseReleased(mouseEvent); + mouseReleased(mouseEvent); } finally { @@ -84,17 +65,19 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler } @Override + @Copy("mouseClicked") @Replace("mouseClicked") public void mouseClicked(MouseEvent event) { event = client.getCallbacks().mouseClicked(event); if (!event.isConsumed()) { - rs$mouseClicked(event); + mouseClicked(event); } } @Override + @Copy("mouseEntered") @Replace("mouseEntered") public synchronized void mouseEntered(MouseEvent mouseEvent) { @@ -107,7 +90,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler isInEvent++; try { - rs$mouseEntered(mouseEvent); + mouseEntered(mouseEvent); } finally { @@ -118,6 +101,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler @Override + @Copy("mouseExited") @Replace("mouseExited") public synchronized void mouseExited(MouseEvent mouseEvent) { @@ -130,7 +114,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler isInEvent++; try { - rs$mouseExited(mouseEvent); + mouseExited(mouseEvent); } finally { @@ -140,6 +124,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler } @Override + @Copy("mouseDragged") @Replace("mouseDragged") public synchronized void mouseDragged(MouseEvent mouseEvent) { @@ -152,7 +137,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler isInEvent++; try { - rs$mouseDragged(mouseEvent); + mouseDragged(mouseEvent); } finally { @@ -162,6 +147,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler } @Override + @Copy("mouseMoved") @Replace("mouseMoved") public synchronized void mouseMoved(MouseEvent mouseEvent) { @@ -174,7 +160,7 @@ public abstract class RSMouseHandlerMixin implements RSMouseHandler isInEvent++; try { - rs$mouseMoved(mouseEvent); + mouseMoved(mouseEvent); } finally { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java index 61df42056f..e730b827f9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java @@ -38,17 +38,15 @@ public abstract class RSMouseWheelHandlerMixin implements RSMouseWheelHandler @Shadow("client") private static RSClient client; - @Copy("mouseWheelMoved") - abstract void rs$mouseWheelMoved(MouseWheelEvent event); - @Override + @Copy("mouseWheelMoved") @Replace("mouseWheelMoved") public void mouseWheelMoved(MouseWheelEvent event) { event = client.getCallbacks().mouseWheelMoved(event); if (!event.isConsumed()) { - rs$mouseWheelMoved(event); + mouseWheelMoved(event); } } } \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java index 0d7b46d337..c3675f45a5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java @@ -119,15 +119,14 @@ public abstract class RSNPCMixin implements RSNPC } @Copy("getModel") - public abstract RSModel rs$getModel(); - @Replace("getModel") - public RSModel rl$getModel() + @SuppressWarnings("InfiniteRecursion") + public RSModel copy$getModel() { if (!client.isInterpolateNpcAnimations() || getAnimation() == AnimationID.HELLHOUND_DEFENCE) { - return rs$getModel(); + return copy$getModel(); } int actionFrame = getActionFrame(); int poseFrame = getPoseFrame(); @@ -139,7 +138,7 @@ public abstract class RSNPCMixin implements RSNPC setActionFrame(Integer.MIN_VALUE | getActionFrameCycle() << 16 | actionFrame); setPoseFrame(Integer.MIN_VALUE | getPoseFrameCycle() << 16 | poseFrame); setSpotAnimationFrame(Integer.MIN_VALUE | getSpotAnimationFrameCycle() << 16 | spotAnimFrame); - return rs$getModel(); + return copy$getModel(); } finally { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java index 772c15e81b..6dc79d58b1 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java @@ -245,15 +245,14 @@ public abstract class RSPlayerMixin implements RSPlayer return model.getConvexHull(getX(), getY(), getOrientation(), tileHeight); } + @SuppressWarnings("InfiniteRecursion") @Copy("getModel") - public abstract RSModel rs$getModel(); - @Replace("getModel") - public RSModel rl$getModel() + public RSModel copy$getModel() { if (!client.isInterpolatePlayerAnimations()) { - return rs$getModel(); + return copy$getModel(); } int actionFrame = getActionFrame(); int poseFrame = getPoseFrame(); @@ -265,7 +264,7 @@ public abstract class RSPlayerMixin implements RSPlayer setActionFrame(Integer.MIN_VALUE | getActionFrameCycle() << 16 | actionFrame); setPoseFrame(Integer.MIN_VALUE | getPoseFrameCycle() << 16 | poseFrame); setSpotAnimationFrame(Integer.MIN_VALUE | getSpotAnimationFrameCycle() << 16 | spotAnimFrame); - return rs$getModel(); + return copy$getModel(); } finally { @@ -290,14 +289,13 @@ public abstract class RSPlayerMixin implements RSPlayer } @Copy("read") - public abstract void rs$read(RSBuffer buffer); - @Replace("read") - public void rl$read(RSBuffer buffer) + @SuppressWarnings("InfiniteRecursion") + public void copy$read(RSBuffer buffer) { final long appearanceHash = getPlayerAppearance() == null ? 0 : getPlayerAppearance().getHash(); - rs$read(buffer); + this.copy$read(buffer); if (getPlayerAppearance().getHash() != appearanceHash) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java index 198ad56c74..a3c984f34e 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java @@ -28,13 +28,8 @@ public abstract class RSRasterizer2DMixin implements RSClient } @Copy("Rasterizer2D_fillRectangleGradientAlpha") - private static void rs$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) - { - throw new RuntimeException(); - } - @Replace("Rasterizer2D_fillRectangleGradientAlpha") - private static void rl$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) + private static void copy$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { final int width = client.getGraphicsPixelsWidth(); final int startX = client.getStartX(); @@ -45,7 +40,7 @@ public abstract class RSRasterizer2DMixin implements RSClient if (!client.isGpu()) { - rs$drawGradientAlpha(var0, var1, var2, var3, var4, var5, var6, var7); + copy$drawGradientAlpha(var0, var1, var2, var3, var4, var5, var6, var7); return; } @@ -110,13 +105,8 @@ public abstract class RSRasterizer2DMixin implements RSClient } @Copy("Rasterizer2D_drawGradientPixels") - public static void rs$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) - { - throw new RuntimeException(); - } - @Replace("Rasterizer2D_drawGradientPixels") - public static void rl$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) + public static void copy$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { final int width = client.getGraphicsPixelsWidth(); final int height = client.getGraphicsPixelsHeight(); @@ -124,7 +114,7 @@ public abstract class RSRasterizer2DMixin implements RSClient if (!client.isGpu()) { - rs$raster2d7(var0, var1, var2, var3, var4, var5, var6, var7); + copy$raster2d7(var0, var1, var2, var3, var4, var5, var6, var7); return; } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java index bf28751d30..c276cc4397 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java @@ -81,7 +81,7 @@ public abstract class RSSceneMixin implements RSScene private static int rl$drawDistance; @Replace("draw") - void rl$drawScene(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane) + void drawScene(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane) { final DrawCallbacks drawCallbacks = client.getDrawCallbacks(); if (drawCallbacks != null) @@ -410,12 +410,11 @@ public abstract class RSSceneMixin implements RSScene } @Copy("newWallDecoration") - abstract public void rs$addBoundaryDecoration(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long hash, int var12); - @Replace("newWallDecoration") - public void rl$addBoundaryDecoration(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long hash, int var12) + @SuppressWarnings("InfiniteRecursion") + public void copy$addBoundaryDecoration(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long hash, int var12) { - rs$addBoundaryDecoration(plane, x, y, floor, var5, var6, var7, var8, var9, var10, hash, var12); + copy$addBoundaryDecoration(plane, x, y, floor, var5, var6, var7, var8, var9, var10, hash, var12); Tile tile = getTiles()[plane][x][y]; if (tile != null) { @@ -428,12 +427,11 @@ public abstract class RSSceneMixin implements RSScene } @Copy("newGroundItemPile") - abstract public void rs$addItemPile(int plane, int x, int y, int hash, Entity var5, long var6, Entity var7, Entity var8); - @Replace("newGroundItemPile") - public void rl$addItemPile(int plane, int x, int y, int hash, Entity var5, long var6, Entity var7, Entity var8) + @SuppressWarnings("InfiniteRecursion") + public void copy$addItemPile(int plane, int x, int y, int hash, Entity var5, long var6, Entity var7, Entity var8) { - rs$addItemPile(plane, x, y, hash, var5, var6, var7, var8); + copy$addItemPile(plane, x, y, hash, var5, var6, var7, var8); Tile tile = getTiles()[plane][x][y]; if (tile != null) { @@ -446,12 +444,11 @@ public abstract class RSSceneMixin implements RSScene } @Copy("newFloorDecoration") - abstract public void rs$groundObjectSpawned(int plane, int x, int y, int floor, Entity var5, long hash, int var7); - @Replace("newFloorDecoration") - public void rl$groundObjectSpawned(int plane, int x, int y, int floor, Entity var5, long hash, int var7) + @SuppressWarnings("InfiniteRecursion") + public void copy$groundObjectSpawned(int plane, int x, int y, int floor, Entity var5, long hash, int var7) { - rs$groundObjectSpawned(plane, x, y, floor, var5, hash, var7); + copy$groundObjectSpawned(plane, x, y, floor, var5, hash, var7); Tile tile = getTiles()[plane][x][y]; if (tile != null) { @@ -464,12 +461,11 @@ public abstract class RSSceneMixin implements RSScene } @Copy("newBoundaryObject") - abstract public void rs$addBoundary(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, long hash, int var10); - @Replace("newBoundaryObject") - public void rl$addBoundary(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, long hash, int var10) + @SuppressWarnings("InfiniteRecursion") + public void copy$addBoundary(int plane, int x, int y, int floor, Entity var5, Entity var6, int var7, int var8, long hash, int var10) { - rs$addBoundary(plane, x, y, floor, var5, var6, var7, var8, hash, var10); + copy$addBoundary(plane, x, y, floor, var5, var6, var7, var8, hash, var10); Tile tile = getTiles()[plane][x][y]; if (tile != null) { @@ -482,16 +478,14 @@ public abstract class RSSceneMixin implements RSScene } @Copy("drawTileUnderlay") - abstract public void rs$drawTileUnderlay(TilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y); - @Replace("drawTileUnderlay") - public void rl$drawTileUnderlay(TilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y) + public void copy$drawTileUnderlay(TilePaint tile, int z, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y) { if (!client.isGpu()) { try { - rs$drawTileUnderlay(tile, z, pitchSin, pitchCos, yawSin, yawCos, x, y); + copy$drawTileUnderlay(tile, z, pitchSin, pitchCos, yawSin, yawCos, x, y); } catch (Exception ex) { @@ -609,14 +603,12 @@ public abstract class RSSceneMixin implements RSScene } @Copy("drawTileOverlay") - abstract public void rs$drawTileOverlay(TileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y); - @Replace("drawTileOverlay") - public void rl$drawTileOverlay(TileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY) + public void copy$drawTileOverlay(TileModel tile, int pitchSin, int pitchCos, int yawSin, int yawCos, int tileX, int tileY) { if (!client.isGpu()) { - rs$drawTileOverlay(tile, pitchSin, pitchCos, yawSin, yawCos, tileX, tileY); + copy$drawTileOverlay(tile, pitchSin, pitchCos, yawSin, yawCos, tileX, tileY); return; } @@ -829,14 +821,12 @@ public abstract class RSSceneMixin implements RSScene } @Copy("drawTileMinimap") - abstract void rs$drawTile(int[] pixels, int pixelOffset, int width, int z, int x, int y); - @Replace("drawTileMinimap") - public void rl$drawTile(int[] pixels, int pixelOffset, int width, int z, int x, int y) + public void copy$drawTile(int[] pixels, int pixelOffset, int width, int z, int x, int y) { if (!hdMinimapEnabled) { - rs$drawTile(pixels, pixelOffset, width, z, x, y); + copy$drawTile(pixels, pixelOffset, width, z, x, y); return; } Tile tile = getTiles()[z][x][y]; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceDefinitionMixin.java index 4bf1ab4538..b16a72a39e 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceDefinitionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSSequenceDefinitionMixin.java @@ -16,10 +16,9 @@ public abstract class RSSequenceDefinitionMixin implements RSSequenceDefinition private static RSClient client; @Copy("applyTransformations") - public abstract RSModel rs$applyTransformations(RSModel model, int actionFrame, RSSequenceDefinition poseSeq, int poseFrame); - @Replace("applyTransformations") - public RSModel rl$applyTransformations(RSModel model, int actionFrame, RSSequenceDefinition poseSeq, int poseFrame) + @SuppressWarnings("InfiniteRecursion") + public RSModel copy$applyTransformations(RSModel model, int actionFrame, RSSequenceDefinition poseSeq, int poseFrame) { // reset frame ids because we're not interpolating this if (actionFrame < 0) @@ -32,19 +31,17 @@ public abstract class RSSequenceDefinitionMixin implements RSSequenceDefinition int packed = poseFrame ^ Integer.MIN_VALUE; poseFrame = packed & 0xFFFF; } - return rs$applyTransformations(model, actionFrame, poseSeq, poseFrame); + return copy$applyTransformations(model, actionFrame, poseSeq, poseFrame); } @Copy("transformActorModel") - public abstract RSModel rs$transformActorModel(RSModel model, int frameIdx); - @Replace("transformActorModel") - public RSModel rl$transformActorModel(RSModel model, int frame) + public RSModel copy$transformActorModel(RSModel model, int frame) { // check if the frame has not been modified if (frame >= 0) { - return rs$transformActorModel(model, frame); + return copy$transformActorModel(model, frame); } // remove flag to check if the frame has been modified @@ -84,15 +81,13 @@ public abstract class RSSequenceDefinitionMixin implements RSSequenceDefinition } @Copy("transformObjectModel") - public abstract RSModel rs$transformObjectModel(RSModel model, int frame, int rotation); - @Replace("transformObjectModel") - public RSModel rl$transformObjectModel(RSModel model, int frame, int rotation) + public RSModel copy$transformObjectModel(RSModel model, int frame, int rotation) { // check if the frame has not been modified if (frame >= 0) { - return rs$transformObjectModel(model, frame, rotation); + return copy$transformObjectModel(model, frame, rotation); } // remove flag to check if the frame has been modified @@ -159,15 +154,13 @@ public abstract class RSSequenceDefinitionMixin implements RSSequenceDefinition } @Copy("transformSpotAnimationModel") - public abstract RSModel rs$transformSpotAnimationModel(RSModel model, int frame); - @Replace("transformSpotAnimationModel") - public RSModel rl$transformSpotAnimationModel(RSModel model, int frame) + public RSModel copy$transformSpotAnimationModel(RSModel model, int frame) { // check if the frame has not been modified if (frame >= 0) { - return rs$transformSpotAnimationModel(model, frame); + return copy$transformSpotAnimationModel(model, frame); } // remove flag to check if the frame has been modified @@ -206,15 +199,13 @@ public abstract class RSSequenceDefinitionMixin implements RSSequenceDefinition } @Copy("transformWidgetModel") - public abstract RSModel rs$transformWidgetModel(RSModel model, int frame); - @Replace("transformWidgetModel") - public RSModel rl$transformWidgetModel(RSModel model, int frame) + public RSModel copy$transformWidgetModel(RSModel model, int frame) { // check if the frame has not been modified if (frame >= 0) { - return rs$transformWidgetModel(model, frame); + return copy$transformWidgetModel(model, frame); } // remove flag to check if the frame has been modified diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSSpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSSpriteMixin.java index b8070779eb..536a1ef0a9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSSpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSSpriteMixin.java @@ -147,16 +147,13 @@ public abstract class RSSpriteMixin implements RSSprite } @Copy("drawRotatedMaskedCenteredAround") - abstract void rs$drawAlphaMapped(int x, int y, int width, int height, int xOffset, int yOffset, - int rotation, int zoom, int[] xOffsets, int[] yOffsets); - @Replace("drawRotatedMaskedCenteredAround") - public void rl$drawAlphaMapped(int x, int y, int width, int height, int xOffset, int yOffset, int rotation, + public void copy$drawAlphaMapped(int x, int y, int width, int height, int xOffset, int yOffset, int rotation, int zoom, int[] xOffsets, int[] yOffsets) { if (!hdMinimapEnabled) { - rs$drawAlphaMapped(x, y, width, height, xOffset, yOffset, rotation, zoom, xOffsets, yOffsets); + copy$drawAlphaMapped(x, y, width, height, xOffset, yOffset, rotation, zoom, xOffsets, yOffsets); return; } try diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java index 60f6704086..93f48ab61c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java @@ -45,17 +45,15 @@ public abstract class RSTextureMixin implements RSTexture private float rl$v; @Copy("animate") - public abstract void rs$animate(int diff); - @Replace("animate") - public void rl$animate(int diff) + public void copy$animate(int diff) { // The client animates textures by cycling the backing pixels of the texture each fram // based on how long it was since the last tick. On GPU we let the plugin manage this // which will calculate uvs instead. if (!client.isGpu()) { - rs$animate(diff); + copy$animate(diff); return; } assert client.getDrawCallbacks() != null; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java index 0e8bd43c0c..4d65465d44 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java @@ -245,9 +245,12 @@ public abstract class RSTileMixin implements RSTile List result = new ArrayList(); Node node = layer.getBottom(); - while (node instanceof TileItem) + while (node instanceof RSTileItem) { - result.add((TileItem) node); + RSTileItem item = (RSTileItem) node; + item.setX(getX()); + item.setY(getY()); + result.add(item); node = node.getNext(); } return result; @@ -506,9 +509,7 @@ public abstract class RSTileMixin implements RSTile return; } - RSNodeDeque itemDeque = newQueue; - - if (itemDeque == null) + if (newQueue == null) { if (lastUnlink != null) { @@ -519,7 +520,7 @@ public abstract class RSTileMixin implements RSTile } // The new item gets added to either the head, or the tail, depending on its price - RSNode head = itemDeque.getSentinel(); + RSNode head = newQueue.getSentinel(); RSTileItem current = null; RSNode next = head.getPrevious(); //boolean forward = false; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSUserMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSUserMixin.java index ac8fb4a5da..c351da8d41 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSUserMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSUserMixin.java @@ -1,13 +1,20 @@ package net.runelite.mixins; +import net.runelite.api.events.NameableNameChanged; +import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSUser; import net.runelite.rs.api.RSUsername; @Mixin(RSUser.class) public abstract class RSUserMixin implements RSUser { + @Shadow("client") + private static RSClient client; + @Override @Inject public String getName() @@ -22,4 +29,11 @@ public abstract class RSUserMixin implements RSUser RSUsername prevName = getRsPrevName(); return prevName == null ? null : prevName.getName(); } + + @FieldHook("previousUsername") + @Inject + public void onPrevNameChanged(int idx) + { + client.getCallbacks().post(NameableNameChanged.class, new NameableNameChanged(this)); + } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index b4f7a9eefb..3643f236d2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -176,6 +176,13 @@ public abstract class RSWidgetMixin implements RSWidget return -1; } + @Inject + @Override + public String getButtonText() + { + return getRSButtonText().replace('\u00A0', ' '); + } + @Inject @Override public String getText() @@ -583,16 +590,15 @@ public abstract class RSWidgetMixin implements RSWidget } @Copy("getModel") - public abstract RSModel rs$getModel(RSSequenceDefinition sequence, int frame, boolean alternate, RSPlayerAppearance playerComposition); - @Replace("getModel") - public RSModel rl$getModel(RSSequenceDefinition sequence, int frame, boolean alternate, RSPlayerAppearance playerComposition) + @SuppressWarnings("InfiniteRecursion") + public RSModel copy$getModel(RSSequenceDefinition sequence, int frame, boolean alternate, RSPlayerAppearance playerComposition) { if (frame != -1 && client.isInterpolateWidgetAnimations()) { frame = frame | getModelFrameCycle() << 16 | Integer.MIN_VALUE; } - return rs$getModel(sequence, frame, alternate, playerComposition); + return copy$getModel(sequence, frame, alternate, playerComposition); } @Inject diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java index 20b713e16b..f2fa32d90c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018 Abex - * Copyright (c) 2020 ThatGamerBlue + * Copyright (c) 2020, ThatGamerBlue * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,14 +25,9 @@ */ package net.runelite.mixins; -import java.util.ArrayList; -import java.util.Stack; import java.util.regex.Matcher; import java.util.regex.Pattern; import net.runelite.api.Client; -import static net.runelite.api.Opcodes.INVOKE; -import static net.runelite.api.Opcodes.RETURN; -import static net.runelite.api.Opcodes.RUNELITE_EXECUTE; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.ScriptPostFired; import net.runelite.api.events.ScriptPreFired; @@ -45,6 +40,7 @@ import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSScript; import net.runelite.rs.api.RSScriptEvent; +import static net.runelite.api.Opcodes.*; @Mixin(RSClient.class) public abstract class ScriptVMMixin implements RSClient @@ -52,117 +48,108 @@ public abstract class ScriptVMMixin implements RSClient @Shadow("client") private static Client client; - // This field is set by the ScriptVM raw injector @Inject private static RSScript currentScript; + @Inject + private static RSScriptEvent rootScriptEvent; + // This field is set by the ScriptVM raw injector @Inject private static int currentScriptPC; + // Call is injected by the raw injector @Inject - private static ScriptPostFired deferredEvent = null; + static void setCurrentScript(RSScript script) + { + if (rootScriptEvent != null) + { + if (script != null) + { + ScriptPreFired event = new ScriptPreFired((int) script.getHash(), rootScriptEvent); + client.getCallbacks().post(ScriptPreFired.class, event); + } - @Inject - private static Stack scriptIds = new Stack<>(); + rootScriptEvent = null; + } + + currentScript = script; + } // Call is injected into runScript by the ScriptVM raw injector @Inject static boolean vmExecuteOpcode(int opcode) { - if (deferredEvent != null) + switch (opcode) { - client.getCallbacks().post(ScriptPostFired.class, deferredEvent); - deferredEvent = null; - } - if (opcode == RUNELITE_EXECUTE) - { - assert currentScript.getInstructions()[currentScriptPC] == RUNELITE_EXECUTE; - - int stringStackSize = client.getStringStackSize(); - String stringOp = client.getStringStack()[--stringStackSize]; - client.setStringStackSize(stringStackSize); - - if ("debug".equals(stringOp)) - { - int intStackSize = client.getIntStackSize(); - - String fmt = client.getStringStack()[--stringStackSize]; - StringBuffer out = new StringBuffer(); - Matcher m = Pattern.compile("%(.)").matcher(fmt); - for (; m.find(); ) - { - m.appendReplacement(out, ""); - switch (m.group(1).charAt(0)) - { - case 'i': - case 'd': - out.append(client.getIntStack()[--intStackSize]); - break; - case 's': - out.append(client.getStringStack()[--stringStackSize]); - break; - default: - out.append(m.group(0)).append("=unknown"); - } - } - m.appendTail(out); - - client.getLogger().debug(out.toString()); + case RUNELITE_EXECUTE: + assert currentScript.getInstructions()[currentScriptPC] == RUNELITE_EXECUTE; + int stringStackSize = client.getStringStackSize(); + String stringOp = client.getStringStack()[--stringStackSize]; client.setStringStackSize(stringStackSize); - client.setIntStackSize(intStackSize); - return true; - } - ScriptCallbackEvent event = new ScriptCallbackEvent(); - event.setScript(currentScript); - event.setEventName(stringOp); - client.getCallbacks().post(ScriptCallbackEvent.class, event); - return true; - } - else if (opcode == INVOKE) - { - int id = currentScript.getIntOperands()[currentScriptPC]; - scriptIds.push(id); - ScriptPreFired event = new ScriptPreFired(id); - event.setScriptEvent(null); - client.getCallbacks().post(ScriptPreFired.class, event); - } - else if (opcode == RETURN) - { - if (scriptIds.size() > 1) // let the runScript method handle the final script - { - deferredEvent = new ScriptPostFired(scriptIds.pop()); // fire the event when we've left the script - } + if ("debug".equals(stringOp)) + { + int intStackSize = client.getIntStackSize(); + + String fmt = client.getStringStack()[--stringStackSize]; + StringBuffer out = new StringBuffer(); + Matcher m = Pattern.compile("%(.)").matcher(fmt); + while (m.find()) + { + m.appendReplacement(out, ""); + switch (m.group(1).charAt(0)) + { + case 'i': + case 'd': + out.append(client.getIntStack()[--intStackSize]); + break; + case 's': + out.append(client.getStringStack()[--stringStackSize]); + break; + default: + out.append(m.group(0)).append("=unknown"); + } + } + m.appendTail(out); + + client.getLogger().debug(out.toString()); + + client.setStringStackSize(stringStackSize); + client.setIntStackSize(intStackSize); + return true; + } + + ScriptCallbackEvent event = new ScriptCallbackEvent(); + event.setScript(currentScript); + event.setEventName(stringOp); + client.getCallbacks().post(ScriptCallbackEvent.class, event); + return true; + case INVOKE: + int scriptId = currentScript.getIntOperands()[currentScriptPC]; + client.getCallbacks().post(ScriptPreFired.class, new ScriptPreFired(scriptId, null)); + return false; + case RETURN: + client.getCallbacks().post(ScriptPostFired.class, new ScriptPostFired((int) currentScript.getHash())); + return false; } return false; } @Copy("runScript") - static void rs$runScript(RSScriptEvent event, int maxExecutionTime) - { - throw new RuntimeException(); - } - @Replace("runScript") - static void rl$runScript(RSScriptEvent event, int maxExecutionTime) + static void copy$runScript(RSScriptEvent event, int maxExecutionTime) { Object[] arguments = event.getArguments(); - if (arguments != null && arguments.length > 0 && arguments[0] instanceof JavaScriptCallback) + assert arguments != null && arguments.length > 0; + if (arguments[0] instanceof JavaScriptCallback) { try { - ScriptPreFired preFired = new ScriptPreFired(-1); - preFired.setScriptEvent(event); - client.getCallbacks().post(ScriptPreFired.class, preFired); - ((JavaScriptCallback) arguments[0]).run(event); - - ScriptPostFired postFired = new ScriptPostFired(-1); - client.getCallbacks().post(ScriptPostFired.class, postFired); } - catch (Exception e) // wont catch assertions + catch (Exception e) { client.getLogger().error("Error in JavaScriptCallback", e); } @@ -171,34 +158,12 @@ public abstract class ScriptVMMixin implements RSClient { try { - try - { - scriptIds.push((Integer) event.getArguments()[0]); // this is safe because it will always be the script id - - ScriptPreFired preFired = new ScriptPreFired(scriptIds.peek()); // peek doesn't remove the top item - preFired.setScriptEvent(event); - client.getCallbacks().post(ScriptPreFired.class, preFired); - } - catch (ClassCastException ignored) - { - } - - rs$runScript(event, maxExecutionTime); - - if (!scriptIds.empty()) - { - ScriptPostFired postFired = new ScriptPostFired(scriptIds.pop()); // hopefully the stack should be dry at this point - assert scriptIds.empty() : "Script ID stack should be empty! Contains: " + getAllScriptIds(); - client.getCallbacks().post(ScriptPostFired.class, postFired); - } + rootScriptEvent = event; + copy$runScript(event, maxExecutionTime); } finally { currentScript = null; - while (!scriptIds.empty()) - { - scriptIds.pop(); // make sure the stack is empty, something disastrous happened - } } } } @@ -214,25 +179,4 @@ public abstract class ScriptVMMixin implements RSClient se.setArguments(args); runScript(se, 5000000); } - - @Inject - private static String getAllScriptIds() - { - ArrayList ids = new ArrayList<>(scriptIds); - StringBuilder sb = new StringBuilder(); - boolean first = true; - for (Object item : ids) - { - if (first) - { - first = false; - } - else - { - sb.append(", "); - } - sb.append(item); - } - return sb.toString(); - } } \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java index 62bea2ffd0..550e0be19a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java @@ -57,13 +57,9 @@ public abstract class SoundEffectMixin implements RSClient private static int lastSoundEffectSourceNPCid; @Copy("updateActorSequence") - public static void rs$updateActorSequence(RSActor actor, int size) - { - throw new RuntimeException(); - } - @Replace("updateActorSequence") - public static void rl$updateActorSequence(RSActor actor, int size) + @SuppressWarnings("InfiniteRecursion") + public static void copy$updateActorSequence(RSActor actor, int size) { if (actor instanceof RSNPC) { @@ -71,7 +67,7 @@ public abstract class SoundEffectMixin implements RSClient } lastSoundEffectSourceActor = actor; - rs$updateActorSequence(actor, size); + copy$updateActorSequence(actor, size); lastSoundEffectSourceActor = null; } @@ -162,6 +158,7 @@ public abstract class SoundEffectMixin implements RSClient soundLocations[queuedSoundEffectCount] = position; setQueuedSoundEffectCount(queuedSoundEffectCount + 1); + lastSoundEffectCount = queuedSoundEffectCount + 1; } @Inject diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java index de48e43a8a..e5ac14b7bd 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java @@ -35,13 +35,8 @@ public abstract class SpriteMixin implements RSClient } @Copy("SpriteBuffer_getSprite") - public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2) - { - throw new RuntimeException(); - } - @Replace("SpriteBuffer_getSprite") - public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2) + public static RSSprite copy$loadSprite(RSAbstractArchive var0, int var1, int var2) { Sprite sprite = spriteOverrides.get(var1); @@ -50,6 +45,6 @@ public abstract class SpriteMixin implements RSClient return (RSSprite) sprite; } - return rs$loadSprite(var0, var1, var2); + return copy$loadSprite(var0, var1, var2); } } \ No newline at end of file diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java index 7908b5422f..da1a9e6fc0 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/StretchedModeMaxSizeMixin.java @@ -15,10 +15,9 @@ public abstract class StretchedModeMaxSizeMixin implements RSGameShell private static RSClient client; @Copy("resizeCanvas") - abstract void rs$resizeCanvas(); - @Replace("resizeCanvas") - public void rl$resizeCanvas() + @SuppressWarnings("InfiniteRecursion") + public void copy$resizeCanvas() { if (client.isStretchedEnabled()) { @@ -33,20 +32,18 @@ public abstract class StretchedModeMaxSizeMixin implements RSGameShell } } - rs$resizeCanvas(); + copy$resizeCanvas(); } @Copy("setMaxCanvasSize") - abstract void rs$setMaxCanvasSize(int width, int height); - @Replace("setMaxCanvasSize") - public void rl$setMaxCanvasSize(int width, int height) + public void copy$setMaxCanvasSize(int width, int height) { if (client.isStretchedEnabled() && client.isResized()) { return; } - rs$setMaxCanvasSize(width, height); + copy$setMaxCanvasSize(width, height); } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java index 68b193e97b..119f3f78c3 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java @@ -10,12 +10,13 @@ import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Shadow; import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSEvictingDualNodeHashTable; import net.runelite.rs.api.RSVarbitDefinition; @Mixin(RSClient.class) public abstract class VarbitMixin implements RSClient { + private static final int VARBITS_GROUP = 14; + @Shadow("client") private static RSClient client; @@ -52,24 +53,44 @@ public abstract class VarbitMixin implements RSClient setVarbitValue(getVarps(), varbitId, value); } + @Inject + @Override + public RSVarbitDefinition getVarbitDefinition(int id) + { + assert isClientThread(); + + RSVarbitDefinition varbit; + varbit = varbitCache.getIfPresent(id); + if (varbit != null) + { + return varbit; + } + varbit = (RSVarbitDefinition) getVarbitCache().get(id); + if (varbit != null && !(varbit.getIndex() == 0 && varbit.getMostSignificantBit() == 0 && varbit.getLeastSignificantBit() == 0)) + { + return varbit; + } + + byte[] fileData = getIndexConfig().getConfigData(VARBITS_GROUP, id); + if (fileData == null) + { + return null; + } + varbit = newVarbitDefinition(); + varbit.decode(newBuffer(fileData)); + return varbit; + } + @Inject @Override public int getVarbitValue(int[] varps, int varbitId) { assert client.isClientThread(); - RSVarbitDefinition v = varbitCache.getIfPresent(varbitId); + RSVarbitDefinition v = getVarbitDefinition(varbitId); if (v == null) { - client.getVarbit(varbitId); // load varbit into cache - RSEvictingDualNodeHashTable varbits = client.getVarbitCache(); - v = (RSVarbitDefinition) varbits.get(varbitId); // get from cache - varbitCache.put(varbitId, v); - } - - if (v.getIndex() == 0 && v.getLeastSignificantBit() == 0 && v.getMostSignificantBit() == 0) - { - throw new IndexOutOfBoundsException("Varbit " + varbitId + " does not exist"); + throw new IndexOutOfBoundsException(String.format("Varbit %d does not exist!", varbitId)); // oob for "backwards compatibility lol" } int value = varps[v.getIndex()]; @@ -83,13 +104,10 @@ public abstract class VarbitMixin implements RSClient @Override public void setVarbitValue(int[] varps, int varbitId, int value) { - RSVarbitDefinition v = varbitCache.getIfPresent(varbitId); + RSVarbitDefinition v = getVarbitDefinition(varbitId); if (v == null) { - client.getVarbit(varbitId); // load varbit into cache - RSEvictingDualNodeHashTable varbits = client.getVarbitCache(); - v = (RSVarbitDefinition) varbits.get(varbitId); // get from cache - varbitCache.put(varbitId, v); + throw new IndexOutOfBoundsException(String.format("Varbit %d does not exist!", varbitId)); // oob for "backwards compatibility lol" } int lsb = v.getLeastSignificantBit(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java index 26a5586247..946fea9118 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/WidgetSpriteMixin.java @@ -17,13 +17,8 @@ public abstract class WidgetSpriteMixin implements RSWidget private static Map widgetSpriteOverrides; @Copy("getSprite") - public RSSprite rs$getWidgetSprite(boolean var1) - { - throw new RuntimeException(); - } - @Replace("getSprite") - public RSSprite rl$getWidgetSprite(boolean var1) + public RSSprite copy$getWidgetSprite(boolean var1) { if (getSpriteId() != -1) { @@ -35,7 +30,7 @@ public abstract class WidgetSpriteMixin implements RSWidget } } - return rs$getWidgetSprite(var1); + return copy$getWidgetSprite(var1); } @Inject diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index 052bc4ee74..fe3f6c7003 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -7,4 +7,8 @@ public interface RSAbstractArchive extends IndexDataBase { @Import("takeFile") byte[] getConfigData(int archiveId, int fileId); + + @Import("getGroupFileIds") + @Override + int[] getFileIds(int group); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index df02ac9afa..86ce152acb 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -457,6 +457,10 @@ public interface RSClient extends RSGameShell, Client @Import("SpriteBuffer_spritePalette") void setIndexedSpritePalette(int[] indexedSpritePalette); + @Import("archive2") + @Override + RSArchive getIndexConfig(); + @Import("archive6") RSArchive getMusicTracks(); @@ -468,7 +472,7 @@ public interface RSClient extends RSGameShell, Client @Override RSArchive getIndexScripts(); - @Import("widgetClickMasks") + @Import("widgetFlags") @Override RSNodeHashTable getWidgetFlags(); @@ -1066,6 +1070,14 @@ public interface RSClient extends RSGameShell, Client @Override void setSelectedSpellName(String name); + @Override + @Import("selectedSpellActionName") + String getSelectedSpellActionName(); + + @Override + @Import("selectedSpellFlags") + int getSelectedSpellFlags(); + @Import("isSpellSelected") boolean isSpellSelected(); @@ -1139,10 +1151,18 @@ public interface RSClient extends RSGameShell, Client @Override void setSelectedItemID(int id); + @Import("selectedItemSlot") + @Override + int getSelectedItemSlot(); + @Import("selectedItemSlot") @Override void setSelectedItemSlot(int index); + @Import("selectedItemWidget") + @Override + int getSelectedItemWidget(); + @Import("selectedItemWidget") @Override void setSelectedItemWidget(int widgetID); @@ -1272,4 +1292,25 @@ public interface RSClient extends RSGameShell, Client @Import("rightTitleSprite") void setRightTitleSprite(Sprite background); + + @Construct + RSBuffer newBuffer(byte[] bytes); + + @Construct + RSVarbitDefinition newVarbitDefinition(); + + @Override + @Import("followerIndex") + int getFollowerIndex(); + + @Override + @Import("isItemSelected") + int isItemSelected(); + + @Override + @Import("selectedItemName") + String getSelectedItemName(); + + @Import("meslayerContinueWidget") + Widget getMessageContinueWidget(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java index a3b7e24cb1..5810edcc9c 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java @@ -65,6 +65,10 @@ public interface RSItemDefinition extends ItemDefinition @Override String[] getInventoryActions(); + @Import("groundActions") + @Override + String[] getGroundActions(); + @Import("getShiftClickIndex") @Override int getShiftClickActionIndex(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java index fdc17aa1e0..758a554b7d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java @@ -65,4 +65,10 @@ public interface RSPlayer extends RSActor, Player @Import("headIconPk") int getRsSkullIcon(); + + @Import("skillLevel") + int getRSSkillLevel(); + + @Import("actions") + String[] getActions(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java index 947106c183..4e6850e27d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java @@ -1,8 +1,9 @@ package net.runelite.rs.api; +import net.runelite.api.VarbitDefinition; import net.runelite.mapping.Import; -public interface RSVarbitDefinition extends RSDualNode +public interface RSVarbitDefinition extends VarbitDefinition, RSDualNode { @Import("baseVar") int getIndex(); @@ -12,4 +13,7 @@ public interface RSVarbitDefinition extends RSDualNode @Import("endBit") int getMostSignificantBit(); + + @Import("decode") + void decode(RSBuffer buffer); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 73edb5c214..cd4fa96f6b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -60,10 +60,10 @@ public interface RSWidget extends Widget @Import("parentId") void setParentId(int id); - @Import("clickMask") + @Import("flags") int getClickMask(); - @Import("clickMask") + @Import("flags") void setClickMask(int mask); //@Import("boundsIndex") -- unused for now @@ -99,6 +99,16 @@ public interface RSWidget extends Widget @Override String[] getActions(); + @Import("itemActions") + @Override + String[] getItemActions(); + + @Import("spellName") + String getSpellName(); + + @Import("buttonText") + String getRSButtonText(); + @Import("text") String getRSText(); @@ -221,6 +231,10 @@ public interface RSWidget extends Widget @Override void setType(int type); + @Import("buttonType") + @Override + int getButtonType(); + @Import("scrollX") @Override int getScrollX(); diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 6420592024..4c51dfbfba 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public abstract class AbstractArchive { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lmu;" + descriptor = "Lmu;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; @@ -32,7 +32,7 @@ public abstract class AbstractArchive { int[] groupNameHashes; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lmh;" + descriptor = "Lmh;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; @@ -53,7 +53,7 @@ public abstract class AbstractArchive { int[][] fileNameHashes; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lmh;" + descriptor = "[Lmh;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; @@ -88,7 +88,7 @@ public abstract class AbstractArchive { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BB)V", + descriptor = "([BB)V", garbageValue = "-101" ) @Export("decodeIndex") @@ -221,7 +221,7 @@ public abstract class AbstractArchive { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "479482423" ) @Export("loadRegionFromGroup") @@ -230,7 +230,7 @@ public abstract class AbstractArchive { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)[B", + descriptor = "(III)[B", garbageValue = "1860640327" ) @Export("takeFile") @@ -240,7 +240,7 @@ public abstract class AbstractArchive { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II[II)[B", + descriptor = "(II[II)[B", garbageValue = "-1226634846" ) @Export("takeFileEncrypted") @@ -270,7 +270,7 @@ public abstract class AbstractArchive { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Z", + descriptor = "(III)Z", garbageValue = "1957538709" ) @Export("tryLoadFile") @@ -291,7 +291,7 @@ public abstract class AbstractArchive { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "-2058273834" ) public boolean method4359(int var1) { @@ -306,7 +306,7 @@ public abstract class AbstractArchive { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "1896348837" ) @Export("tryLoadGroup") @@ -321,7 +321,7 @@ public abstract class AbstractArchive { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "0" ) @Export("isFullyLoaded") @@ -343,7 +343,7 @@ public abstract class AbstractArchive { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-1350822089" ) @Export("groupLoadPercent") @@ -353,7 +353,7 @@ public abstract class AbstractArchive { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(II)[B", + descriptor = "(II)[B", garbageValue = "1718789334" ) @Export("takeFileFlat") @@ -369,7 +369,7 @@ public abstract class AbstractArchive { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(III)[B", + descriptor = "(III)[B", garbageValue = "490044156" ) @Export("getFile") @@ -395,7 +395,7 @@ public abstract class AbstractArchive { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(II)[B", + descriptor = "(II)[B", garbageValue = "1362853135" ) @Export("getFileFlat") @@ -411,7 +411,7 @@ public abstract class AbstractArchive { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1560066319" ) @Export("loadGroup") @@ -420,7 +420,7 @@ public abstract class AbstractArchive { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IB)[I", + descriptor = "(IB)[I", garbageValue = "-56" ) @Export("getGroupFileIds") @@ -430,7 +430,7 @@ public abstract class AbstractArchive { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-888140327" ) @Export("getGroupFileCount") @@ -440,7 +440,7 @@ public abstract class AbstractArchive { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-763058439" ) @Export("getGroupCount") @@ -450,7 +450,7 @@ public abstract class AbstractArchive { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1760033757" ) @Export("clearGroups") @@ -463,7 +463,7 @@ public abstract class AbstractArchive { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-546235261" ) @Export("clearFilesGroup") @@ -476,7 +476,7 @@ public abstract class AbstractArchive { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "1" ) @Export("clearFiles") @@ -493,7 +493,7 @@ public abstract class AbstractArchive { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I[II)Z", + descriptor = "(I[II)Z", garbageValue = "-1692394825" ) @Export("buildFiles") @@ -618,7 +618,7 @@ public abstract class AbstractArchive { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", + descriptor = "(Ljava/lang/String;I)I", garbageValue = "-1113782685" ) @Export("getGroupId") @@ -629,7 +629,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)I", + descriptor = "(ILjava/lang/String;I)I", garbageValue = "1362853135" ) @Export("getFileId") @@ -640,7 +640,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", garbageValue = "-1310066556" ) @Export("isValidFileName") @@ -658,7 +658,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", garbageValue = "-222408314" ) @Export("takeFileByNames") @@ -672,7 +672,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", garbageValue = "-778364429" ) @Export("tryLoadFileByNames") @@ -686,7 +686,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Z", + descriptor = "(Ljava/lang/String;B)Z", garbageValue = "-81" ) @Export("tryLoadGroupByName") @@ -698,7 +698,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1143877885" ) @Export("loadRegionFromName") @@ -712,7 +712,7 @@ public abstract class AbstractArchive { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", + descriptor = "(Ljava/lang/String;I)I", garbageValue = "-252379742" ) @Export("groupLoadPercentByName") @@ -724,7 +724,7 @@ public abstract class AbstractArchive { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;IIIIIII)V", + descriptor = "(Lkn;IIIIIII)V", garbageValue = "-1571118584" ) @Export("loadTerrain") @@ -790,7 +790,7 @@ public abstract class AbstractArchive { @ObfuscatedName("gr") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "682759182" ) static final int method4411() { diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 48516bc317..bcc0b5596c 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -11,7 +11,7 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)[B", + descriptor = "(I)[B", garbageValue = "300747627" ) @Export("get") @@ -19,7 +19,7 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BB)V", + descriptor = "([BB)V", garbageValue = "92" ) @Export("set") diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 39d5f18f12..22d3ee7d1c 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index fd53cae232..3a128a923f 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -28,7 +28,7 @@ public abstract class AbstractRasterProvider { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "-5" ) @Export("drawFull") @@ -36,7 +36,7 @@ public abstract class AbstractRasterProvider { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "-1334771637" ) @Export("draw") @@ -44,7 +44,7 @@ public abstract class AbstractRasterProvider { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "25855118" ) @Export("apply") diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 40b7d650f2..d0bcc7a67e 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -12,7 +12,7 @@ public abstract class AbstractSocket { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-768493590" ) @Export("close") @@ -20,7 +20,7 @@ public abstract class AbstractSocket { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-8" ) @Export("readUnsignedByte") @@ -28,7 +28,7 @@ public abstract class AbstractSocket { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1942767880" ) @Export("available") @@ -36,7 +36,7 @@ public abstract class AbstractSocket { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "1355091335" ) @Export("isAvailable") @@ -44,7 +44,7 @@ public abstract class AbstractSocket { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)I", + descriptor = "([BIIB)I", garbageValue = "37" ) @Export("read") @@ -52,7 +52,7 @@ public abstract class AbstractSocket { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIIB)V", + descriptor = "([BIIB)V", garbageValue = "-105" ) @Export("write") diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index a42cc6e53f..63a520a6b5 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -23,7 +23,7 @@ public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;S)V", + descriptor = "(Ljava/util/Comparator;S)V", garbageValue = "-28900" ) @Export("addComparator") @@ -38,7 +38,7 @@ public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljf;Ljf;I)I", + descriptor = "(Ljf;Ljf;I)I", garbageValue = "864234218" ) @Export("compareUser") diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 5b2abd5753..ad79114d82 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -69,7 +69,7 @@ public abstract class AbstractWorldMapData { byte[][][] field175; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[[[[Lak;" + descriptor = "[[[[Lak;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; @@ -88,7 +88,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1774414997" ) @Export("readGeography") @@ -96,7 +96,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "923610125" ) @Export("isFullyLoaded") @@ -106,7 +106,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lic;S)V", + descriptor = "(Lic;S)V", garbageValue = "19318" ) @Export("loadGeography") @@ -124,7 +124,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1097959131" ) @Export("reset") @@ -140,7 +140,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IILkn;I)V", + descriptor = "(IILkn;I)V", garbageValue = "929230318" ) @Export("readTile") @@ -158,7 +158,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IILkn;II)V", + descriptor = "(IILkn;II)V", garbageValue = "1830113999" ) void method319(int var1, int var2, Buffer var3, int var4) { @@ -172,7 +172,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IILkn;IB)V", + descriptor = "(IILkn;IB)V", garbageValue = "73" ) void method320(int var1, int var2, Buffer var3, int var4) { @@ -216,7 +216,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "3" ) @Export("getRegionX") @@ -226,7 +226,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-4" ) @Export("getRegionY") @@ -236,7 +236,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", + descriptor = "(Ljava/awt/Component;I)V", garbageValue = "-1541126292" ) static void method342(Component var0) { @@ -247,7 +247,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2015859206" ) public static void method343() { @@ -257,7 +257,7 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "324919704" ) static final void method328() { diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index ffd647d076..8da4b580a0 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -9,19 +9,19 @@ import net.runelite.mapping.ObfuscatedSignature; public abstract class AbstractWorldMapIcon { @ObfuscatedName("es") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive17") static Archive archive17; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhg;" + descriptor = "Lhg;" ) @Export("coord2") public final Coord coord2; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhg;" + descriptor = "Lhg;" ) @Export("coord1") public final Coord coord1; @@ -39,7 +39,7 @@ public abstract class AbstractWorldMapIcon { int screenY; @ObfuscatedSignature( - signature = "(Lhg;Lhg;)V" + descriptor = "(Lhg;Lhg;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; @@ -48,7 +48,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "0" ) @Export("getElement") @@ -56,7 +56,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Lar;", + descriptor = "(B)Lar;", garbageValue = "35" ) @Export("getLabel") @@ -64,7 +64,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1804331962" ) @Export("getSubWidth") @@ -72,7 +72,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1265869629" ) @Export("getSubHeight") @@ -80,7 +80,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(III)Z", + descriptor = "(III)Z", garbageValue = "422348755" ) @Export("fitsScreen") @@ -94,7 +94,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "807957820" ) @Export("hasValidElement") @@ -104,7 +104,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(III)Z", + descriptor = "(III)Z", garbageValue = "872444562" ) @Export("elementFitsScreen") @@ -158,7 +158,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "1" ) @Export("labelFitsScreen") @@ -175,7 +175,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-288699605" ) public static void method687() { @@ -194,7 +194,7 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedName("fk") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "-886030498" ) @Export("queueSoundEffect") diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index f2e7fba8e4..862346b38c 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -58,7 +58,7 @@ public final class AccessFile { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "239881906" ) @Export("write") @@ -75,7 +75,7 @@ public final class AccessFile { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1767391731" ) @Export("close") @@ -85,7 +85,7 @@ public final class AccessFile { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZB)V", + descriptor = "(ZB)V", garbageValue = "-19" ) @Export("closeSync") @@ -106,7 +106,7 @@ public final class AccessFile { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)J", + descriptor = "(I)J", garbageValue = "997596889" ) @Export("length") @@ -116,7 +116,7 @@ public final class AccessFile { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIII)I", + descriptor = "([BIII)I", garbageValue = "-1991806699" ) @Export("read") diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 841b1e2cf6..83a7831ec7 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -133,7 +133,7 @@ public abstract class Actor extends Entity { int[] hitSplatValues2; @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Ljx;" + descriptor = "Ljx;" ) @Export("healthBars") IterableNodeDeque healthBars; @@ -366,7 +366,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "1" ) @Export("isVisible") @@ -376,7 +376,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "78" ) final void method1810() { @@ -386,7 +386,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(IIIIIII)V", + descriptor = "(IIIIIII)V", garbageValue = "-1007174032" ) @Export("addHitSplat") @@ -481,7 +481,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(IIIIIII)V", + descriptor = "(IIIIIII)V", garbageValue = "-680285813" ) @Export("addHealthBar") @@ -543,7 +543,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "43" ) @Export("removeHealthBar") @@ -561,7 +561,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lch;Lch;IZI)I", + descriptor = "(Lch;Lch;IZI)I", garbageValue = "-1172543926" ) @Export("compareWorlds") @@ -609,7 +609,7 @@ public abstract class Actor extends Entity { @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "([BIIB)I", + descriptor = "([BIIB)I", garbageValue = "46" ) static int method1822(byte[] var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index e4f0d384c5..05bd56c3fc 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -16,7 +16,7 @@ public class Animation { static int[] field1663; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ler;" + descriptor = "Ler;" ) @Export("skeleton") Skeleton skeleton; @@ -47,7 +47,7 @@ public class Animation { } @ObfuscatedSignature( - signature = "([BLer;)V" + descriptor = "([BLer;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index d49052b0c5..1a2430dfae 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -24,7 +24,7 @@ public class ApproximateRouteStrategy extends RouteStrategy { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIILfz;I)Z", + descriptor = "(IIILfz;I)Z", garbageValue = "-1966963917" ) @Export("hasArrived") @@ -34,7 +34,7 @@ public class ApproximateRouteStrategy extends RouteStrategy { @ObfuscatedName("ha") @ObfuscatedSignature( - signature = "(Lby;IIBI)V", + descriptor = "(Lby;IIBI)V", garbageValue = "-549376931" ) static final void method1284(Player var0, int var1, int var2, byte var3) { @@ -56,7 +56,7 @@ public class ApproximateRouteStrategy extends RouteStrategy { @ObfuscatedName("hc") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", garbageValue = "-63" ) @Export("insertMenuItem") @@ -78,106 +78,106 @@ public class ApproximateRouteStrategy extends RouteStrategy { @ObfuscatedName("id") @ObfuscatedSignature( - signature = "(Ljz;IIII)V", + descriptor = "(Ljz;IIII)V", garbageValue = "1974138271" ) @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + static final void addNpcToMenu(NPCDefinition npcDef, int npcIdx, int sceneX, int sceneY) { if (Client.menuOptionsCount < 400) { - if (var0.transforms != null) { - var0 = var0.transform(); + if (npcDef.transforms != null) { + npcDef = npcDef.transform(); } - if (var0 != null) { - if (var0.isInteractable) { - if (!var0.isFollower || Client.followerIndex == var1) { - String var4 = var0.name; - if (var0.combatLevel != 0) { - var4 = var4 + Canvas.method924(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")"; + if (npcDef != null) { + if (npcDef.isInteractable) { + if (!npcDef.isFollower || Client.followerIndex == npcIdx) { + String npcName = npcDef.name; + if (npcDef.combatLevel != 0) { + npcName = npcName + Canvas.getColorForCombatDifference(npcDef.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + npcDef.combatLevel + ")"; } - if (var0.isFollower && Client.followerOpsLowPriority) { - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + if (npcDef.isFollower && Client.followerOpsLowPriority) { + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + npcName, 1003, npcIdx, sceneX, sceneY); } if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + var4, 7, var1, var2, var3); + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + npcName, 7, npcIdx, sceneX, sceneY); } else if (Client.isSpellSelected) { if ((WorldMapSprite.selectedSpellFlags & 2) == 2) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + var4, 8, var1, var2, var3); + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + npcName, 8, npcIdx, sceneX, sceneY); } } else { - int var5 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var6 = var0.actions; - int var7; - int var8; - if (var6 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var6[var7] != null && !var6[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if (var7 == 0) { - var8 = var5 + 9; + int flwrOffset = npcDef.isFollower && Client.followerOpsLowPriority ? 2000 : 0; + String[] actions = npcDef.actions; + int i; + int opcode; + if (actions != null) { + for (i = 4; i >= 0; --i) { + if (actions[i] != null && !actions[i].equalsIgnoreCase("Attack")) { + opcode = 0; + if (i == 0) { + opcode = flwrOffset + 9; } - if (var7 == 1) { - var8 = var5 + 10; + if (i == 1) { + opcode = flwrOffset + 10; } - if (var7 == 2) { - var8 = var5 + 11; + if (i == 2) { + opcode = flwrOffset + 11; } - if (var7 == 3) { - var8 = var5 + 12; + if (i == 3) { + opcode = flwrOffset + 12; } - if (var7 == 4) { - var8 = var5 + 13; + if (i == 4) { + opcode = flwrOffset + 13; } - ScriptEvent.insertMenuItemNoShift(var6[var7], ItemContainer.colorStartTag(16776960) + var4, var8, var1, var2, var3); + ScriptEvent.insertMenuItemNoShift(actions[i], ItemContainer.colorStartTag(16776960) + npcName, opcode, npcIdx, sceneX, sceneY); } } } - if (var6 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var6[var7] != null && var6[var7].equalsIgnoreCase("Attack")) { - short var9 = 0; + if (actions != null) { + for (i = 4; i >= 0; --i) { + if (actions[i] != null && actions[i].equalsIgnoreCase("Attack")) { + short atkOffset = 0; if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class60.localPlayer.combatLevel) { - var9 = 2000; + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && npcDef.combatLevel > class60.localPlayer.combatLevel) { + atkOffset = 2000; } - var8 = 0; - if (var7 == 0) { - var8 = var9 + 9; + opcode = 0; + if (i == 0) { + opcode = atkOffset + 9; } - if (var7 == 1) { - var8 = var9 + 10; + if (i == 1) { + opcode = atkOffset + 10; } - if (var7 == 2) { - var8 = var9 + 11; + if (i == 2) { + opcode = atkOffset + 11; } - if (var7 == 3) { - var8 = var9 + 12; + if (i == 3) { + opcode = atkOffset + 12; } - if (var7 == 4) { - var8 = var9 + 13; + if (i == 4) { + opcode = atkOffset + 13; } - ScriptEvent.insertMenuItemNoShift(var6[var7], ItemContainer.colorStartTag(16776960) + var4, var8, var1, var2, var3); + ScriptEvent.insertMenuItemNoShift(actions[i], ItemContainer.colorStartTag(16776960) + npcName, opcode, npcIdx, sceneX, sceneY); } } } } - if (!var0.isFollower || !Client.followerOpsLowPriority) { - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + if (!npcDef.isFollower || !Client.followerOpsLowPriority) { + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + npcName, 1003, npcIdx, sceneX, sceneY); } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 0a5ed6a4cf..8fdbd4d3cd 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -13,13 +13,13 @@ public class Archive extends AbstractArchive { static CRC32 Archive_crc; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llp;" + descriptor = "Llp;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Llp;" + descriptor = "Llp;" ) @Export("masterDisk") ArchiveDisk masterDisk; @@ -59,7 +59,7 @@ public class Archive extends AbstractArchive { } @ObfuscatedSignature( - signature = "(Llp;Llp;IZZZ)V" + descriptor = "(Llp;Llp;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); @@ -75,7 +75,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "479482423" ) @Export("loadRegionFromGroup") @@ -91,7 +91,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-1350822089" ) @Export("groupLoadPercent") @@ -116,7 +116,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1560066319" ) @Export("loadGroup") @@ -131,7 +131,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "6460755" ) public boolean method4456() { @@ -140,7 +140,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("di") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1538719165" ) @Export("percentage") @@ -170,7 +170,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dp") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1870441691" ) @Export("loadIndex") @@ -187,7 +187,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dc") @ObfuscatedSignature( - signature = "(I[BZZI)V", + descriptor = "(I[BZZI)V", garbageValue = "-1362503762" ) @Export("write") @@ -220,7 +220,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dt") @ObfuscatedSignature( - signature = "(Llp;I[BZI)V", + descriptor = "(Llp;I[BZI)V", garbageValue = "416222280" ) @Export("load") @@ -311,7 +311,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("ds") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1106038504" ) @Export("loadAllLocal") @@ -344,7 +344,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "1634778176" ) public boolean method4460(int var1) { @@ -353,7 +353,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("do") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "-587516749" ) public boolean method4452(int var1) { @@ -362,7 +362,7 @@ public class Archive extends AbstractArchive { @ObfuscatedName("dn") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1037828577" ) @Export("loadPercent") diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 14b496068c..64cee0d812 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -14,13 +14,13 @@ public final class ArchiveDisk { static byte[] ArchiveDisk_buffer; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmn;" + descriptor = "Lmn;" ) @Export("datFile") BufferedFile datFile; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lmn;" + descriptor = "Lmn;" ) @Export("idxFile") BufferedFile idxFile; @@ -42,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - signature = "(ILmn;Lmn;I)V" + descriptor = "(ILmn;Lmn;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -56,7 +56,7 @@ public final class ArchiveDisk { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)[B", + descriptor = "(II)[B", garbageValue = "475820078" ) @Export("read") @@ -153,7 +153,7 @@ public final class ArchiveDisk { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I[BIB)Z", + descriptor = "(I[BIB)Z", garbageValue = "3" ) @Export("write") @@ -174,7 +174,7 @@ public final class ArchiveDisk { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I[BIZS)Z", + descriptor = "(I[BIZS)Z", garbageValue = "21116" ) @Export("write0") diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index f7b0c1515a..8da6094a02 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -18,13 +18,13 @@ public class ArchiveDiskAction extends Node { byte[] data; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llp;" + descriptor = "Llp;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive") Archive archive; @@ -34,7 +34,7 @@ public class ArchiveDiskAction extends Node { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkb;II)Z", + descriptor = "(Lkb;II)Z", garbageValue = "-1045128194" ) @Export("updateExternalPlayer") @@ -150,7 +150,7 @@ public class ArchiveDiskAction extends Node { @ObfuscatedName("js") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "-418956614" ) static boolean method4302(int var0) { diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 0d71840747..9c25cc3e40 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; @@ -92,7 +92,7 @@ public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Lic;I)I", + descriptor = "(Lic;Lic;I)I", garbageValue = "-1395527740" ) static int method4429(AbstractArchive var0, AbstractArchive var1) { @@ -155,7 +155,7 @@ public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "8" ) @Export("isWorldMapEvent") @@ -165,7 +165,7 @@ public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedName("fh") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZB)V", + descriptor = "(Ljava/lang/String;ZB)V", garbageValue = "-20" ) @Export("drawLoadingMessage") diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 9920a3b2ad..36d8b74be6 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -19,7 +19,7 @@ public class ArchiveLoader { static String userHomeDirectory; @ObfuscatedName("an") @ObfuscatedSignature( - signature = "Llo;" + descriptor = "Llo;" ) @Export("rasterProvider") public static AbstractRasterProvider rasterProvider; @@ -28,13 +28,13 @@ public class ArchiveLoader { static boolean mouseCam; @ObfuscatedName("fy") @ObfuscatedSignature( - signature = "Lfa;" + descriptor = "Lfa;" ) @Export("socketTask") static Task socketTask; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive") final Archive archive; @@ -52,7 +52,7 @@ public class ArchiveLoader { int loadedCount; @ObfuscatedSignature( - signature = "(Lig;Ljava/lang/String;)V" + descriptor = "(Lig;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -62,7 +62,7 @@ public class ArchiveLoader { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1314527591" ) @Export("isLoaded") @@ -80,7 +80,7 @@ public class ArchiveLoader { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "1299326622" ) static int method1212(int var0, int var1) { @@ -104,7 +104,7 @@ public class ArchiveLoader { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "677134031" ) static int method1213(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 03755320ed..bfc5cad5e7 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -10,38 +10,38 @@ import net.runelite.rs.ScriptOpcodes; public enum AttackOption implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lco;" + descriptor = "Lco;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lco;" + descriptor = "Lco;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lco;" + descriptor = "Lco;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lco;" + descriptor = "Lco;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); @ObfuscatedName("of") @ObfuscatedSignature( - signature = "Lcy;" + descriptor = "Lcy;" ) @Export("varcs") static Varcs varcs; @ObfuscatedName("hj") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("mapDotSprites") static Sprite[] mapDotSprites; @@ -58,7 +58,7 @@ public enum AttackOption implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -68,7 +68,7 @@ public enum AttackOption implements Enumerated { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Llh;", + descriptor = "(I)Llh;", garbageValue = "-1275433341" ) public static IndexedSprite method2173() { @@ -87,7 +87,7 @@ public enum AttackOption implements Enumerated { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-37" ) public static void method2181() { @@ -97,7 +97,7 @@ public enum AttackOption implements Enumerated { @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(ILcs;ZB)I", + descriptor = "(ILcs;ZB)I", garbageValue = "-99" ) static int method2180(int var0, Script var1, boolean var2) { @@ -192,7 +192,7 @@ public enum AttackOption implements Enumerated { @ObfuscatedName("ho") @ObfuscatedSignature( - signature = "(IIIIB)V", + descriptor = "(IIIIB)V", garbageValue = "-113" ) @Export("selectSpell") diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 86dafa255f..64b1499ede 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -107,7 +107,7 @@ public class AudioFilter { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkn;Lds;)V" + descriptor = "(Lkn;Lds;)V" ) final void method2829(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 48d1dabe62..16883750cf 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class BZip2Decompressor { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Llk;" + descriptor = "Llk;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -40,7 +40,7 @@ public final class BZip2Decompressor { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Llk;)V" + descriptor = "(Llk;)V" ) static void method6004(BZip2State var0) { byte var2 = var0.out_char; @@ -166,7 +166,7 @@ public final class BZip2Decompressor { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Llk;)V" + descriptor = "(Llk;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -540,7 +540,7 @@ public final class BZip2Decompressor { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Llk;)B" + descriptor = "(Llk;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { @@ -549,7 +549,7 @@ public final class BZip2Decompressor { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Llk;)B" + descriptor = "(Llk;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { @@ -558,7 +558,7 @@ public final class BZip2Decompressor { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILlk;)I" + descriptor = "(ILlk;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -578,7 +578,7 @@ public final class BZip2Decompressor { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Llk;)V" + descriptor = "(Llk;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 04471e9a7b..2539cdd831 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -182,7 +182,7 @@ public final class BZip2State { @ObfuscatedName("iq") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lhd;I)Ljava/lang/String;", + descriptor = "(Ljava/lang/String;Lhd;I)Ljava/lang/String;", garbageValue = "-1638627143" ) static String method6001(String var0, Widget var1) { diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 6f9b8f06a1..4b5549197e 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -39,13 +39,13 @@ public final class BoundaryObject { int orientationB; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("entity1") public Entity entity1; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("entity2") public Entity entity2; @@ -69,7 +69,7 @@ public final class BoundaryObject { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1351583068" ) static void method3390() { @@ -89,7 +89,7 @@ public final class BoundaryObject { @ObfuscatedName("hz") @ObfuscatedSignature( - signature = "(Lkb;I)V", + descriptor = "(Lkb;I)V", garbageValue = "-1547224129" ) static final void method3389(PacketBuffer var0) { diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 752bec4380..bc982a7cbd 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -43,7 +43,7 @@ public class Bounds { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-2102954293" ) @Export("setLow") @@ -54,7 +54,7 @@ public class Bounds { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "-40" ) @Export("setHigh") @@ -65,7 +65,7 @@ public class Bounds { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Llv;Llv;I)V", + descriptor = "(Llv;Llv;I)V", garbageValue = "1555379366" ) public void method6202(Bounds var1, Bounds var2) { @@ -75,7 +75,7 @@ public class Bounds { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Llv;Llv;B)V", + descriptor = "(Llv;Llv;B)V", garbageValue = "58" ) void method6199(Bounds var1, Bounds var2) { @@ -98,7 +98,7 @@ public class Bounds { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Llv;Llv;I)V", + descriptor = "(Llv;Llv;I)V", garbageValue = "-810970943" ) void method6194(Bounds var1, Bounds var2) { @@ -121,7 +121,7 @@ public class Bounds { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "515582700" ) int method6193() { @@ -130,7 +130,7 @@ public class Bounds { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-500619811" ) int method6196() { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 0932f863b1..768c4048dc 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -32,7 +32,7 @@ public class Buddy extends User { @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-820539853" ) @Export("set") @@ -43,7 +43,7 @@ public class Buddy extends User { @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1724193250" ) @Export("getWorld") @@ -53,7 +53,7 @@ public class Buddy extends User { @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-279238296" ) @Export("hasWorld") @@ -63,7 +63,7 @@ public class Buddy extends User { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "562871414" ) static int method5363(int var0, int var1) { @@ -152,7 +152,7 @@ public class Buddy extends User { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lic;III)Llh;", + descriptor = "(Lic;III)Llh;", garbageValue = "214880487" ) static IndexedSprite method5355(AbstractArchive var0, int var1, int var2) { @@ -170,7 +170,7 @@ public class Buddy extends User { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IS)V", + descriptor = "(IS)V", garbageValue = "1714" ) static void method5349(int var0) { diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index ce6bc0620c..1f853bbd80 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -19,7 +19,7 @@ public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;I)I", + descriptor = "(Lkx;Lkx;I)I", garbageValue = "1665981134" ) @Export("compareBuddy") @@ -37,7 +37,7 @@ public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", garbageValue = "-1830826767" ) static String method3556(String var0) { diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 1a3a090863..0d4379c2c1 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -72,7 +72,7 @@ public class Buffer extends Node { @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1332846958" ) @Export("releaseArray") @@ -86,7 +86,7 @@ public class Buffer extends Node { @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-238244279" ) @Export("writeByte") @@ -96,7 +96,7 @@ public class Buffer extends Node { @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-2062616020" ) @Export("writeShort") @@ -107,7 +107,7 @@ public class Buffer extends Node { @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1322343150" ) @Export("writeMedium") @@ -119,7 +119,7 @@ public class Buffer extends Node { @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "1526300467" ) @Export("writeInt") @@ -156,7 +156,7 @@ public class Buffer extends Node { @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "1754555155" ) @Export("writeBoolean") @@ -166,7 +166,7 @@ public class Buffer extends Node { @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "914637380" ) @Export("writeStringCp1252NullTerminated") @@ -182,7 +182,7 @@ public class Buffer extends Node { @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "2130981128" ) @Export("writeStringCp1252NullCircumfixed") @@ -199,7 +199,7 @@ public class Buffer extends Node { @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)V", + descriptor = "(Ljava/lang/CharSequence;I)V", garbageValue = "1273602380" ) @Export("writeCESU8") @@ -247,7 +247,7 @@ public class Buffer extends Node { @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "([BIIB)V", + descriptor = "([BIIB)V", garbageValue = "96" ) @Export("writeBytes") @@ -260,7 +260,7 @@ public class Buffer extends Node { @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-914578816" ) public void method5711(Buffer var1) { @@ -269,7 +269,7 @@ public class Buffer extends Node { @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "1697969107" ) @Export("writeLengthInt") @@ -286,7 +286,7 @@ public class Buffer extends Node { @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-510969382" ) @Export("writeLengthShort") @@ -301,7 +301,7 @@ public class Buffer extends Node { @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-767264169" ) @Export("writeLengthByte") @@ -315,7 +315,7 @@ public class Buffer extends Node { @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "416798651" ) @Export("writeSmartByteShort") @@ -331,7 +331,7 @@ public class Buffer extends Node { @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "18" ) @Export("writeVarInt") @@ -357,7 +357,7 @@ public class Buffer extends Node { @ObfuscatedName("br") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "124" ) @Export("readUnsignedByte") @@ -367,7 +367,7 @@ public class Buffer extends Node { @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(B)B", + descriptor = "(B)B", garbageValue = "81" ) @Export("readByte") @@ -377,7 +377,7 @@ public class Buffer extends Node { @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "471084162" ) @Export("readUnsignedShort") @@ -388,7 +388,7 @@ public class Buffer extends Node { @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "87414619" ) @Export("readShort") @@ -404,7 +404,7 @@ public class Buffer extends Node { @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1982311791" ) @Export("readMedium") @@ -415,7 +415,7 @@ public class Buffer extends Node { @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "94863796" ) @Export("readInt") @@ -426,7 +426,7 @@ public class Buffer extends Node { @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "(I)J", + descriptor = "(I)J", garbageValue = "-497792504" ) @Export("readLong") @@ -438,7 +438,7 @@ public class Buffer extends Node { @ObfuscatedName("ch") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "364318278" ) @Export("readBoolean") @@ -448,7 +448,7 @@ public class Buffer extends Node { @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "1669124168" ) @Export("readStringCp1252NullTerminatedOrNull") @@ -463,7 +463,7 @@ public class Buffer extends Node { @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", + descriptor = "(B)Ljava/lang/String;", garbageValue = "60" ) @Export("readStringCp1252NullTerminated") @@ -479,7 +479,7 @@ public class Buffer extends Node { @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", + descriptor = "(B)Ljava/lang/String;", garbageValue = "-10" ) @Export("readStringCp1252NullCircumfixed") @@ -500,7 +500,7 @@ public class Buffer extends Node { @ObfuscatedName("cn") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "-1123161230" ) @Export("readCESU8") @@ -522,7 +522,7 @@ public class Buffer extends Node { @ObfuscatedName("ce") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "2094233778" ) @Export("readBytes") @@ -535,7 +535,7 @@ public class Buffer extends Node { @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1710018513" ) @Export("readShortSmart") @@ -546,7 +546,7 @@ public class Buffer extends Node { @ObfuscatedName("ck") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-96" ) @Export("readUShortSmart") @@ -557,7 +557,7 @@ public class Buffer extends Node { @ObfuscatedName("cv") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "715402244" ) public int method5732() { @@ -574,7 +574,7 @@ public class Buffer extends Node { @ObfuscatedName("cp") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "81140995" ) public int method5733() { @@ -583,7 +583,7 @@ public class Buffer extends Node { @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "11" ) public int method5843() { @@ -597,7 +597,7 @@ public class Buffer extends Node { @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "841550272" ) @Export("readVarInt") @@ -614,7 +614,7 @@ public class Buffer extends Node { @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "([II)V", + descriptor = "([II)V", garbageValue = "-1857698855" ) @Export("xteaEncryptAll") @@ -642,7 +642,7 @@ public class Buffer extends Node { @ObfuscatedName("co") @ObfuscatedSignature( - signature = "([II)V", + descriptor = "([II)V", garbageValue = "-1432585027" ) @Export("xteaDecryptAll") @@ -670,7 +670,7 @@ public class Buffer extends Node { @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "([IIII)V", + descriptor = "([IIII)V", garbageValue = "-230257638" ) @Export("xteaEncrypt") @@ -700,7 +700,7 @@ public class Buffer extends Node { @ObfuscatedName("cm") @ObfuscatedSignature( - signature = "([IIII)V", + descriptor = "([IIII)V", garbageValue = "1537225216" ) @Export("xteaDecrypt") @@ -730,7 +730,7 @@ public class Buffer extends Node { @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", garbageValue = "-859977936" ) @Export("encryptRsa") @@ -749,7 +749,7 @@ public class Buffer extends Node { @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-693896153" ) @Export("writeCrc") @@ -761,7 +761,7 @@ public class Buffer extends Node { @ObfuscatedName("cd") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1948165259" ) @Export("checkCrc") @@ -774,7 +774,7 @@ public class Buffer extends Node { @ObfuscatedName("cy") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "2052645276" ) @Export("writeIntME") @@ -784,7 +784,7 @@ public class Buffer extends Node { @ObfuscatedName("cx") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "0" ) public void method5744(int var1) { @@ -793,7 +793,7 @@ public class Buffer extends Node { @ObfuscatedName("cs") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-394267159" ) public void method5837(int var1) { @@ -802,7 +802,7 @@ public class Buffer extends Node { @ObfuscatedName("cr") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "851416829" ) public int method5746() { @@ -811,7 +811,7 @@ public class Buffer extends Node { @ObfuscatedName("cl") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "2135245803" ) public int method5936() { @@ -820,7 +820,7 @@ public class Buffer extends Node { @ObfuscatedName("dx") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1231018339" ) public int method5748() { @@ -829,7 +829,7 @@ public class Buffer extends Node { @ObfuscatedName("dw") @ObfuscatedSignature( - signature = "(I)B", + descriptor = "(I)B", garbageValue = "-209851904" ) public byte method5730() { @@ -838,7 +838,7 @@ public class Buffer extends Node { @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "(I)B", + descriptor = "(I)B", garbageValue = "1146670320" ) public byte method5750() { @@ -847,7 +847,7 @@ public class Buffer extends Node { @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "(I)B", + descriptor = "(I)B", garbageValue = "-658631883" ) public byte method5751() { @@ -856,7 +856,7 @@ public class Buffer extends Node { @ObfuscatedName("dh") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "118" ) public void method5752(int var1) { @@ -866,7 +866,7 @@ public class Buffer extends Node { @ObfuscatedName("dl") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-327298658" ) public void method5753(int var1) { @@ -876,7 +876,7 @@ public class Buffer extends Node { @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "137731710" ) public void method5898(int var1) { @@ -886,7 +886,7 @@ public class Buffer extends Node { @ObfuscatedName("di") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1619364591" ) public int method5755() { @@ -896,7 +896,7 @@ public class Buffer extends Node { @ObfuscatedName("dp") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-31" ) public int method5867() { @@ -906,7 +906,7 @@ public class Buffer extends Node { @ObfuscatedName("dc") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "713390854" ) public int method5757() { @@ -916,7 +916,7 @@ public class Buffer extends Node { @ObfuscatedName("dt") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1572434954" ) public int method5758() { @@ -931,7 +931,7 @@ public class Buffer extends Node { @ObfuscatedName("ds") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "89596822" ) public int method5759() { @@ -946,7 +946,7 @@ public class Buffer extends Node { @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "95" ) public void method5798(int var1) { @@ -957,7 +957,7 @@ public class Buffer extends Node { @ObfuscatedName("do") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "1" ) public int method5761() { @@ -967,7 +967,7 @@ public class Buffer extends Node { @ObfuscatedName("dn") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-68115848" ) public void method5762(int var1) { @@ -979,7 +979,7 @@ public class Buffer extends Node { @ObfuscatedName("db") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-95" ) @Export("writeShortLE") @@ -992,7 +992,7 @@ public class Buffer extends Node { @ObfuscatedName("de") @ObfuscatedSignature( - signature = "(IS)V", + descriptor = "(IS)V", garbageValue = "-18106" ) public void method5764(int var1) { @@ -1004,7 +1004,7 @@ public class Buffer extends Node { @ObfuscatedName("dv") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1451471311" ) public int method5765() { @@ -1014,7 +1014,7 @@ public class Buffer extends Node { @ObfuscatedName("dk") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-684888758" ) public int method5766() { @@ -1024,7 +1024,7 @@ public class Buffer extends Node { @ObfuscatedName("da") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-2146396815" ) public int method5767() { @@ -1034,7 +1034,7 @@ public class Buffer extends Node { @ObfuscatedName("df") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "-2049590377" ) public void method5821(byte[] var1, int var2, int var3) { @@ -1046,7 +1046,7 @@ public class Buffer extends Node { @ObfuscatedName("jx") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-801005893" ) static void method5950() { diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 9eccb5f737..5850db04c2 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class BufferedFile { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmy;" + descriptor = "Lmy;" ) @Export("accessFile") AccessFile accessFile; @@ -71,7 +71,7 @@ public class BufferedFile { long fileOffset; @ObfuscatedSignature( - signature = "(Lmy;II)V" + descriptor = "(Lmy;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; @@ -86,7 +86,7 @@ public class BufferedFile { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "159388731" ) @Export("close") @@ -107,7 +107,7 @@ public class BufferedFile { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)J", + descriptor = "(I)J", garbageValue = "243378114" ) @Export("length") @@ -117,7 +117,7 @@ public class BufferedFile { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BI)V", + descriptor = "([BI)V", garbageValue = "1810550632" ) @Export("readFully") @@ -127,7 +127,7 @@ public class BufferedFile { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)V", + descriptor = "([BIIB)V", garbageValue = "-4" ) @Export("read") @@ -233,7 +233,7 @@ public class BufferedFile { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1659142795" ) @Export("load") @@ -263,7 +263,7 @@ public class BufferedFile { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "1917244707" ) @Export("write") @@ -341,7 +341,7 @@ public class BufferedFile { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1996252506" ) @Export("flush") diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 113e699c8d..2f9629c278 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -13,13 +13,13 @@ public class BufferedNetSocket extends AbstractSocket { Socket socket; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lli;" + descriptor = "Lli;" ) @Export("source") BufferedSource source; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llu;" + descriptor = "Llu;" ) @Export("sink") BufferedSink sink; @@ -36,7 +36,7 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-768493590" ) @Export("close") @@ -53,7 +53,7 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-8" ) @Export("readUnsignedByte") @@ -63,7 +63,7 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1942767880" ) @Export("available") @@ -73,7 +73,7 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "1355091335" ) @Export("isAvailable") @@ -83,7 +83,7 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)I", + descriptor = "([BIIB)I", garbageValue = "37" ) @Export("read") @@ -93,7 +93,7 @@ public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIIB)V", + descriptor = "([BIIB)V", garbageValue = "-105" ) @Export("write") diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 582c2ae507..fbe83c5a76 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -56,7 +56,7 @@ public class BufferedSink implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "49" ) @Export("isClosed") @@ -81,7 +81,7 @@ public class BufferedSink implements Runnable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "2083374722" ) @Export("write") @@ -121,7 +121,7 @@ public class BufferedSink implements Runnable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(S)V", + descriptor = "(S)V", garbageValue = "7072" ) @Export("close") diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index d90d218193..66eca3943d 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -54,7 +54,7 @@ public class BufferedSource implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "733897471" ) @Export("isAvailable") @@ -88,7 +88,7 @@ public class BufferedSource implements Runnable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "122" ) @Export("available") @@ -112,7 +112,7 @@ public class BufferedSource implements Runnable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "400008412" ) @Export("readUnsignedByte") @@ -135,7 +135,7 @@ public class BufferedSource implements Runnable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BIIB)I", + descriptor = "([BIIB)I", garbageValue = "24" ) @Export("read") @@ -176,7 +176,7 @@ public class BufferedSource implements Runnable { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-1" ) @Export("close") diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 395114295b..a96e19dc28 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -47,7 +47,7 @@ public class ByteArrayPool { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IZI)[B", + descriptor = "(IZI)[B", garbageValue = "1801183295" ) @Export("ByteArrayPool_getArrayBool") @@ -98,7 +98,7 @@ public class ByteArrayPool { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/Class;", + descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;", garbageValue = "28" ) @Export("loadClassFromDescriptor") diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 698700a41f..2c91422471 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -33,7 +33,7 @@ public final class Canvas extends java.awt.Canvas { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Ljg;", + descriptor = "(II)Ljg;", garbageValue = "83996779" ) @Export("getObjectDefinition") @@ -62,7 +62,7 @@ public final class Canvas extends java.awt.Canvas { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "1398023724" ) static final void method927(String var0) { @@ -74,7 +74,7 @@ public final class Canvas extends java.awt.Canvas { @ObfuscatedName("ga") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "411559133" ) static void method925() { @@ -86,10 +86,11 @@ public final class Canvas extends java.awt.Canvas { @ObfuscatedName("is") @ObfuscatedSignature( - signature = "(III)Ljava/lang/String;", + descriptor = "(III)Ljava/lang/String;", garbageValue = "-266618010" ) - static final String method924(int var0, int var1) { + @Export("getColorForCombatDifference") + static final String getColorForCombatDifference(int var0, int var1) { int var2 = var1 - var0; if (var2 < -9) { return ItemContainer.colorStartTag(16711680); @@ -112,7 +113,7 @@ public final class Canvas extends java.awt.Canvas { @ObfuscatedName("iw") @ObfuscatedSignature( - signature = "(Lhd;II)I", + descriptor = "(Lhd;II)I", garbageValue = "623604092" ) static final int method923(Widget var0, int var1) { @@ -275,7 +276,7 @@ public final class Canvas extends java.awt.Canvas { @ObfuscatedName("kx") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", + descriptor = "(Ljava/lang/String;B)V", garbageValue = "-83" ) @Export("Clan_joinChat") diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index bd591e5d16..283c3fc8b1 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -13,7 +13,7 @@ public class ChatChannel { static SecureRandom secureRandom; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lbr;" + descriptor = "[Lbr;" ) @Export("messages") Message[] messages; @@ -30,7 +30,7 @@ public class ChatChannel { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbr;", + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbr;", garbageValue = "-1" ) @Export("addMessage") @@ -61,7 +61,7 @@ public class ChatChannel { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lbr;", + descriptor = "(II)Lbr;", garbageValue = "-317582349" ) @Export("getMessage") @@ -71,7 +71,7 @@ public class ChatChannel { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1472365930" ) @Export("size") diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 6279996d33..c5ecdf1098 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -11,13 +11,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class ClanChat extends UserList { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) @Export("loginType") final LoginType loginType; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkp;" + descriptor = "Lkp;" ) @Export("localUser") final Usernamed localUser; @@ -43,7 +43,7 @@ public class ClanChat extends UserList { int field3663; @ObfuscatedSignature( - signature = "(Lmo;Lkp;)V" + descriptor = "(Lmo;Lkp;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); @@ -56,7 +56,7 @@ public class ClanChat extends UserList { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljf;", + descriptor = "(I)Ljf;", garbageValue = "551595115" ) @Export("newInstance") @@ -66,7 +66,7 @@ public class ClanChat extends UserList { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljf;", + descriptor = "(II)[Ljf;", garbageValue = "1959965595" ) @Export("newTypedArray") @@ -76,7 +76,7 @@ public class ClanChat extends UserList { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", + descriptor = "(Ljava/lang/String;B)V", garbageValue = "-85" ) @Export("readName") @@ -114,7 +114,7 @@ public class ClanChat extends UserList { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1810188467" ) @Export("setOwner") @@ -152,7 +152,7 @@ public class ClanChat extends UserList { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "585042716" ) @Export("readUpdate") @@ -179,7 +179,7 @@ public class ClanChat extends UserList { @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "-100" ) public final void method5421(Buffer var1) { @@ -221,7 +221,7 @@ public class ClanChat extends UserList { @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-117" ) @Export("clearFriends") @@ -234,7 +234,7 @@ public class ClanChat extends UserList { @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-23" ) @Export("invalidateIgnoreds") @@ -247,7 +247,7 @@ public class ClanChat extends UserList { @ObfuscatedName("co") @ObfuscatedSignature( - signature = "(Lji;I)V", + descriptor = "(Lji;I)V", garbageValue = "244481619" ) @Export("isLocalPlayer") @@ -260,7 +260,7 @@ public class ClanChat extends UserList { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Ljava/net/Socket;III)Llj;", + descriptor = "(Ljava/net/Socket;III)Llj;", garbageValue = "-1116942702" ) public static AbstractSocket method5441(Socket var0, int var1, int var2) throws IOException { @@ -269,7 +269,7 @@ public class ClanChat extends UserList { @ObfuscatedName("el") @ObfuscatedSignature( - signature = "(B)Lma;", + descriptor = "(B)Lma;", garbageValue = "-90" ) @Export("getWorldMap") diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index dd79fe50a5..afc989fd28 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -11,13 +11,13 @@ public class ClanMate extends Buddy { static String otp; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("friend") TriBool friend; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("ignored") TriBool ignored; @@ -29,7 +29,7 @@ public class ClanMate extends Buddy { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "55" ) @Export("clearIsFriend") @@ -39,7 +39,7 @@ public class ClanMate extends Buddy { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1504738052" ) @Export("isFriend") @@ -53,7 +53,7 @@ public class ClanMate extends Buddy { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2080180390" ) @Export("fillIsFriend") @@ -63,7 +63,7 @@ public class ClanMate extends Buddy { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "0" ) @Export("clearIsIgnored") @@ -73,7 +73,7 @@ public class ClanMate extends Buddy { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "10" ) @Export("isIgnored") @@ -87,7 +87,7 @@ public class ClanMate extends Buddy { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1156765322" ) @Export("fillIsIgnored") diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 0f8d2ba45c..b74189fd2a 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -16,7 +16,7 @@ import netscape.javascript.JSObject; public final class Client extends GameShell implements Usernamed { @ObfuscatedName("na") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("clickedWidget") static Widget clickedWidget; @@ -86,16 +86,16 @@ public final class Client extends GameShell implements Usernamed { static int field852; @ObfuscatedName("ng") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; @ObfuscatedName("oi") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) - @Export("widgetClickMasks") - static NodeHashTable widgetClickMasks; + @Export("widgetFlags") + static NodeHashTable widgetFlags; @ObfuscatedName("np") @ObfuscatedGetter( intValue = 152745331 @@ -103,7 +103,7 @@ public final class Client extends GameShell implements Usernamed { static int field853; @ObfuscatedName("nk") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("viewportWidget") static Widget viewportWidget; @@ -137,7 +137,7 @@ public final class Client extends GameShell implements Usernamed { static int field855; @ObfuscatedName("tt") @ObfuscatedSignature( - signature = "Lbs;" + descriptor = "Lbs;" ) static final ApproximateRouteStrategy field905; @ObfuscatedName("nv") @@ -150,7 +150,7 @@ public final class Client extends GameShell implements Usernamed { static int[] rootWidgetYs; @ObfuscatedName("ow") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("scriptEvents") static NodeDeque scriptEvents; @@ -219,7 +219,7 @@ public final class Client extends GameShell implements Usernamed { static int field870; @ObfuscatedName("ni") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("draggedOnWidget") static Widget draggedOnWidget; @@ -235,7 +235,7 @@ public final class Client extends GameShell implements Usernamed { static ArrayList archiveLoaders; @ObfuscatedName("sk") @ObfuscatedSignature( - signature = "Lhv;" + descriptor = "Lhv;" ) @Export("playerAppearance") static PlayerAppearance playerAppearance; @@ -283,7 +283,7 @@ public final class Client extends GameShell implements Usernamed { static int destinationX; @ObfuscatedName("sd") @ObfuscatedSignature( - signature = "[Ld;" + descriptor = "[Ld;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; @@ -309,7 +309,7 @@ public final class Client extends GameShell implements Usernamed { static int[] changedItemContainers; @ObfuscatedName("sf") @ObfuscatedSignature( - signature = "Lmk;" + descriptor = "Lmk;" ) @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; @@ -320,7 +320,7 @@ public final class Client extends GameShell implements Usernamed { static int field878; @ObfuscatedName("mq") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; @@ -376,7 +376,7 @@ public final class Client extends GameShell implements Usernamed { static short field685; @ObfuscatedName("qm") @ObfuscatedSignature( - signature = "[Ldr;" + descriptor = "[Ldr;" ) @Export("soundEffects") static SoundEffect[] soundEffects; @@ -433,7 +433,7 @@ public final class Client extends GameShell implements Usernamed { static int viewportOffsetX; @ObfuscatedName("pw") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("mapIcons") static Sprite[] mapIcons; @@ -486,12 +486,12 @@ public final class Client extends GameShell implements Usernamed { static boolean playerMod; @ObfuscatedName("oj") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) static NodeDeque field891; @ObfuscatedName("ot") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) static NodeDeque field691; @ObfuscatedName("or") @@ -515,13 +515,13 @@ public final class Client extends GameShell implements Usernamed { static String field755; @ObfuscatedName("sx") @ObfuscatedSignature( - signature = "Lbj;" + descriptor = "Lbj;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfz;" + descriptor = "[Lfz;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; @@ -660,13 +660,13 @@ public final class Client extends GameShell implements Usernamed { static int hintArrowSubY; @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "Lco;" + descriptor = "Lco;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "Lco;" + descriptor = "Lco;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; @@ -678,7 +678,7 @@ public final class Client extends GameShell implements Usernamed { static int titleLoadingStage; @ObfuscatedName("dr") @ObfuscatedSignature( - signature = "Lfa;" + descriptor = "Lfa;" ) @Export("js5SocketTask") static Task js5SocketTask; @@ -722,7 +722,7 @@ public final class Client extends GameShell implements Usernamed { static int field675; @ObfuscatedName("er") @ObfuscatedSignature( - signature = "Lfg;" + descriptor = "Lfg;" ) static class169 field708; @ObfuscatedName("el") @@ -736,7 +736,7 @@ public final class Client extends GameShell implements Usernamed { static boolean Login_isUsernameRemembered; @ObfuscatedName("ev") @ObfuscatedSignature( - signature = "Lct;" + descriptor = "Lct;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; @@ -745,7 +745,7 @@ public final class Client extends GameShell implements Usernamed { static byte[] randomDatData; @ObfuscatedName("fc") @ObfuscatedSignature( - signature = "[Lcv;" + descriptor = "[Lcv;" ) @Export("npcs") static NPC[] npcs; @@ -767,7 +767,7 @@ public final class Client extends GameShell implements Usernamed { static int[] field719; @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "Ldx;" + descriptor = "Ldx;" ) @Export("packetWriter") public static final PacketWriter packetWriter; @@ -784,7 +784,7 @@ public final class Client extends GameShell implements Usernamed { static boolean useBufferedSocket; @ObfuscatedName("fs") @ObfuscatedSignature( - signature = "Ljy;" + descriptor = "Ljy;" ) @Export("timer") static Timer timer; @@ -1090,7 +1090,7 @@ public final class Client extends GameShell implements Usernamed { static boolean showLoadingMessages; @ObfuscatedName("ku") @ObfuscatedSignature( - signature = "[Lby;" + descriptor = "[Lby;" ) @Export("players") static Player[] players; @@ -1141,25 +1141,25 @@ public final class Client extends GameShell implements Usernamed { static int combatTargetPlayerIndex; @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "[[[Ljp;" + descriptor = "[[[Ljp;" ) @Export("groundItems") static NodeDeque[][][] groundItems; @ObfuscatedName("kg") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("projectiles") static NodeDeque projectiles; @ObfuscatedName("kb") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; @@ -1276,18 +1276,18 @@ public final class Client extends GameShell implements Usernamed { static int rootInterface; @ObfuscatedName("md") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; @ObfuscatedName("ec") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) Buffer field929; @ObfuscatedName("ee") @ObfuscatedSignature( - signature = "Lz;" + descriptor = "Lz;" ) class9 field851; @@ -1492,7 +1492,7 @@ public final class Client extends GameShell implements Usernamed { scriptEvents = new NodeDeque(); field891 = new NodeDeque(); field691 = new NodeDeque(); - widgetClickMasks = new NodeHashTable(512); + widgetFlags = new NodeHashTable(512); rootWidgetCount = 0; field877 = -2; field813 = new boolean[100]; @@ -1570,7 +1570,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1805213007" ) @Export("resizeGame") @@ -1585,7 +1585,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "108465933" ) @Export("setUp") @@ -1642,7 +1642,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "202919973" ) @Export("doCycle") @@ -1741,7 +1741,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(ZS)V", + descriptor = "(ZS)V", garbageValue = "255" ) @Export("draw") @@ -1856,7 +1856,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1432958229" ) @Export("kill0") @@ -1894,7 +1894,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-453140820" ) protected final void vmethod1570() { @@ -2010,7 +2010,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("eg") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-61" ) @Export("doCycleJs5") @@ -2241,7 +2241,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ey") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "20" ) @Export("doCycleJs5Connect") @@ -2383,7 +2383,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "35" ) @Export("js5Error") @@ -2421,7 +2421,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ee") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "599725078" ) @Export("doCycleLoggedOut") @@ -3064,7 +3064,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ft") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-873982601" ) @Export("doCycleLoggedIn") @@ -3503,7 +3503,7 @@ public final class Client extends GameShell implements Usernamed { ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { if (field785) { - if (KeyHandler.dragInventoryWidget == TaskHandler.field2066 && dragItemSlotSource != dragItemSlotDestination) { + if (KeyHandler.dragInventoryWidget == TaskHandler.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { Widget var43 = KeyHandler.dragInventoryWidget; byte var31 = 0; if (field838 == 1 && var43.contentType == 206) { @@ -3514,7 +3514,7 @@ public final class Client extends GameShell implements Usernamed { var31 = 0; } - if (Projectile.method2249(KeyHandler.getWidgetClickMask(var43))) { + if (Projectile.method2249(KeyHandler.getWidgetFlags(var43))) { var6 = dragItemSlotSource; var7 = dragItemSlotDestination; var43.itemIds[var7] = var43.itemIds[var6]; @@ -3559,7 +3559,7 @@ public final class Client extends GameShell implements Usernamed { } } - if (Scene.method3230()) { + if (Scene.shouldSendWalk()) { var4 = Scene.Scene_selectedX; var5 = Scene.Scene_selectedY; var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2311, packetWriter.isaacCipher); @@ -3568,7 +3568,7 @@ public final class Client extends GameShell implements Usernamed { var18.packetBuffer.writeShort(var4 + class182.baseX); var18.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); packetWriter.addNode(var18); - Scene.method3346(); + Scene.resetWalking(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; @@ -3852,7 +3852,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("fl") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1501968527" ) @Export("resizeJS") @@ -3880,7 +3880,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("fb") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1953660969" ) @Export("drawLoggedIn") @@ -3905,7 +3905,7 @@ public final class Client extends GameShell implements Usernamed { field877 = cycle; viewportX = -1; viewportY = -1; - TaskHandler.field2066 = null; + TaskHandler.hoveredItemContainer = null; if (rootInterface != -1) { rootWidgetCount = 0; NetFileRequest.drawWidgets(rootInterface, 0, 0, Varcs.canvasWidth, class52.canvasHeight, 0, 0, -1); @@ -3973,7 +3973,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("gt") @ObfuscatedSignature( - signature = "(Ldx;B)Z", + descriptor = "(Ldx;B)Z", garbageValue = "-15" ) final boolean method1768(PacketWriter var1) { @@ -4509,12 +4509,12 @@ public final class Client extends GameShell implements Usernamed { for (var29 = var5; var29 <= var21; ++var29) { var23 = (long)var29 + ((long)var16 << 32); - Node var11 = widgetClickMasks.get(var23); + Node var11 = widgetFlags.get(var23); if (var11 != null) { var11.remove(); } - widgetClickMasks.put(new IntegerNode(var22), var23); + widgetFlags.put(new IntegerNode(var22), var23); } var1.serverPacket = null; @@ -4677,7 +4677,7 @@ public final class Client extends GameShell implements Usernamed { } } - widgetClickMasks = new NodeHashTable(512); + widgetFlags = new NodeHashTable(512); while (var3.offset < var16) { var22 = var3.readInt(); @@ -4687,7 +4687,7 @@ public final class Client extends GameShell implements Usernamed { for (int var33 = var29; var33 <= var30; ++var33) { var25 = (long)var33 + ((long)var22 << 32); - widgetClickMasks.put(new IntegerNode(var31), var25); + widgetFlags.put(new IntegerNode(var31), var25); } } @@ -5347,7 +5347,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("hr") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-302072154" ) @Export("menu") @@ -5435,14 +5435,14 @@ public final class Client extends GameShell implements Usernamed { var12 = menuArguments1[var2]; var5 = menuArguments2[var2]; Widget var13 = WorldMapSprite.getWidget(var5); - var8 = KeyHandler.getWidgetClickMask(var13); + var8 = KeyHandler.getWidgetFlags(var13); boolean var7 = (var8 >> 28 & 1) != 0; if (var7) { break label281; } Object var10000 = null; - if (Projectile.method2249(KeyHandler.getWidgetClickMask(var13))) { + if (Projectile.method2249(KeyHandler.getWidgetFlags(var13))) { break label281; } } @@ -5494,7 +5494,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("hh") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1243315480" ) @Export("shouldLeftClickOpenMenu") @@ -5505,7 +5505,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ht") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "4" ) @Export("openMenu") @@ -5517,7 +5517,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ip") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-558702165" ) @Export("resizeRoot") @@ -5533,7 +5533,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ig") @ObfuscatedSignature( - signature = "(Lhd;I)V", + descriptor = "(Lhd;I)V", garbageValue = "-985582804" ) @Export("alignWidget") @@ -5555,7 +5555,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("jz") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1745197570" ) final void method1372() { @@ -5642,7 +5642,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("kr") @ObfuscatedSignature( - signature = "(B)Lkq;", + descriptor = "(B)Lkq;", garbageValue = "-76" ) @Export("username") @@ -5652,7 +5652,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lih;", + descriptor = "(II)Lih;", garbageValue = "1222368622" ) @Export("WorldMapElement_get") @@ -5662,7 +5662,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/io/File;Ljava/io/File;I)V", + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", garbageValue = "1015952997" ) static void method1803(File var0, File var1) { @@ -5686,7 +5686,7 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lbn;B)V", + descriptor = "(Lbn;B)V", garbageValue = "2" ) static void method1522(GameShell var0) { diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 91b5fbc4a6..07a6b02a39 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -9,512 +9,512 @@ import net.runelite.mapping.ObfuscatedSignature; public class ClientPacket implements class190 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2270; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2242; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2243; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2244; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2250; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2298; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2247; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2248; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2249; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2257; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2251; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2252; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2273; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2254; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2292; @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2256; @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2253; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2258; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2259; @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2260; @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2291; @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2261; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2263; @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2264; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2265; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2283; @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2267; @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2268; @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2269; @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2262; @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2340; @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2255; @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2241; @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2274; @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2275; @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2290; @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2344; @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2278; @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2295; @ObfuscatedName("al") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2280; @ObfuscatedName("an") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2281; @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2282; @ObfuscatedName("av") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2296; @ObfuscatedName("af") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2284; @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2285; @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2286; @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2279; @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) static final ClientPacket field2321; @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2289; @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2277; @ObfuscatedName("au") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2329; @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2287; @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2293; @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2294; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2266; @ObfuscatedName("be") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2327; @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2297; @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2301; @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2299; @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2300; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2276; @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2328; @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2303; @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2335; @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2305; @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2306; @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2311; @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2308; @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2309; @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2310; @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2288; @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2312; @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2313; @ObfuscatedName("br") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) static final ClientPacket field2314; @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2315; @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2316; @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2245; @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2318; @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2337; @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2320; @ObfuscatedName("ch") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2304; @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2271; @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2323; @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2324; @ObfuscatedName("cn") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2325; @ObfuscatedName("ce") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2326; @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2319; @ObfuscatedName("ck") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2338; @ObfuscatedName("cv") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2307; @ObfuscatedName("cp") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2330; @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) static final ClientPacket field2331; @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2332; @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2333; @ObfuscatedName("co") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2334; @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2272; @ObfuscatedName("cm") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2336; @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2302; @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2317; @ObfuscatedName("cd") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2339; @ObfuscatedName("cy") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2322; @ObfuscatedName("cx") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) public static final ClientPacket field2341; @ObfuscatedName("eo") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive20") static Archive archive20; diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 6b93edfb63..9c9b015200 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -12,7 +12,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class ClientPreferences { @ObfuscatedName("pv") @ObfuscatedSignature( - signature = "Lkk;" + descriptor = "Lkk;" ) @Export("clanChat") static ClanChat clanChat; @@ -24,7 +24,7 @@ public class ClientPreferences { static int ClientPreferences_optionCount; @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("worldSelectRightSprite") static IndexedSprite worldSelectRightSprite; @@ -63,7 +63,7 @@ public class ClientPreferences { } @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -113,7 +113,7 @@ public class ClientPreferences { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-943142768" ) void method1911(boolean var1) { @@ -121,7 +121,7 @@ public class ClientPreferences { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(S)Lkn;", + descriptor = "(S)Lkn;", garbageValue = "128" ) @Export("toBuffer") @@ -147,7 +147,7 @@ public class ClientPreferences { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIB)I", + descriptor = "(IIB)I", garbageValue = "116" ) static final int method1914(int var0, int var1) { @@ -159,7 +159,7 @@ public class ClientPreferences { @ObfuscatedName("ed") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-82" ) @Export("updateGameState") diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 2cffa887ad..57efb598ff 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -15,7 +15,7 @@ public abstract class Clock { static int field2092; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldo;" + descriptor = "Ldo;" ) @Export("soundCache") public static SoundCache soundCache; @@ -27,7 +27,7 @@ public abstract class Clock { static int clientTickTimeIdx; @ObfuscatedName("do") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive2") static Archive archive2; @@ -37,7 +37,7 @@ public abstract class Clock { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1017447827" ) @Export("mark") @@ -45,7 +45,7 @@ public abstract class Clock { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-1786752641" ) @Export("wait") @@ -53,7 +53,7 @@ public abstract class Clock { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1957582234" ) static int method3641(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 131523f42c..94899cd015 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class CollisionMap { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) @Export("NetCache_responseArchiveBuffer") public static Buffer NetCache_responseArchiveBuffer; @ObfuscatedName("gs") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("headIconPkSprites") static Sprite[] headIconPkSprites; @@ -58,7 +58,7 @@ public class CollisionMap { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "0" ) @Export("clear") @@ -77,7 +77,7 @@ public class CollisionMap { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIZI)V", + descriptor = "(IIIIZI)V", garbageValue = "1939344506" ) public void method3680(int var1, int var2, int var3, int var4, boolean var5) { @@ -229,7 +229,7 @@ public class CollisionMap { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIZI)V", + descriptor = "(IIIIZI)V", garbageValue = "-2000199056" ) @Export("addGameObject") @@ -256,7 +256,7 @@ public class CollisionMap { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "14" ) @Export("setBlockedByFloor") @@ -269,7 +269,7 @@ public class CollisionMap { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "1576549082" ) @Export("setBlockedByFloorDec") @@ -282,7 +282,7 @@ public class CollisionMap { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "-1405991942" ) @Export("setFlag") @@ -293,7 +293,7 @@ public class CollisionMap { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIIZI)V", + descriptor = "(IIIIZI)V", garbageValue = "2079202664" ) public void method3702(int var1, int var2, int var3, int var4, boolean var5) { @@ -445,7 +445,7 @@ public class CollisionMap { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIIIZB)V", + descriptor = "(IIIIIZB)V", garbageValue = "-35" ) @Export("setFlagOffNonSquare") @@ -478,7 +478,7 @@ public class CollisionMap { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "-299380257" ) @Export("setFlagOff") @@ -489,7 +489,7 @@ public class CollisionMap { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "1" ) public void method3689(int var1, int var2) { @@ -501,7 +501,7 @@ public class CollisionMap { @ObfuscatedName("fd") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1042513280" ) static final void method3707() { diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 019608e041..7b40242508 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -27,7 +27,7 @@ public class Coord { public int y; @ObfuscatedSignature( - signature = "(Lhg;)V" + descriptor = "(Lhg;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -54,7 +54,7 @@ public class Coord { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "57" ) @Export("packed") @@ -64,7 +64,7 @@ public class Coord { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhg;I)Z", + descriptor = "(Lhg;I)Z", garbageValue = "1413568323" ) @Export("equalsCoord") @@ -80,7 +80,7 @@ public class Coord { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)Ljava/lang/String;", + descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", garbageValue = "-17265" ) @Export("toString") @@ -106,7 +106,7 @@ public class Coord { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "([BB)[B", + descriptor = "([BB)[B", garbageValue = "113" ) @Export("decompressBytes") @@ -139,7 +139,7 @@ public class Coord { @ObfuscatedName("iy") @ObfuscatedSignature( - signature = "(Lhd;IIIIIIB)V", + descriptor = "(Lhd;IIIIIIB)V", garbageValue = "-69" ) static final void method4135(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 92be3a278d..281dd5956f 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Decimator { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("title_muteSprite") static IndexedSprite[] title_muteSprite; @@ -68,7 +68,7 @@ public class Decimator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BI)[B", + descriptor = "([BI)[B", garbageValue = "880157357" ) @Export("resample") @@ -114,7 +114,7 @@ public class Decimator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "124" ) @Export("scaleRate") @@ -128,7 +128,7 @@ public class Decimator { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "70" ) @Export("scalePosition") diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index aca31065ee..096710feed 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class DefaultsGroup { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llm;" + descriptor = "Llm;" ) static final DefaultsGroup field3822; @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index aaad5f63c6..f12bbeef79 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -14,19 +14,19 @@ public final class DemotingHashTable { int remaining; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("hashTable") IterableNodeHashTable hashTable; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljq;" + descriptor = "Ljq;" ) @Export("queue") IterableDualNodeQueue queue; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lee;" + descriptor = "Lee;" ) class155 field1987; @@ -82,7 +82,7 @@ public final class DemotingHashTable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lfi;)V" + descriptor = "(Lfi;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 8c6144c099..0813cdb07e 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -25,7 +25,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Lmc;", + descriptor = "(I)Lmc;", garbageValue = "-1826697521" ) @Export("get") @@ -155,7 +155,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1686875071" ) void method6495(String var1) { @@ -169,7 +169,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1385366754" ) void method6484(String var1) { @@ -187,7 +187,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", + descriptor = "(Ljava/lang/String;B)V", garbageValue = "1" ) void method6485(String var1) { @@ -204,7 +204,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "2111177426" ) static final boolean method6481(char var0) { diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index e3776aa6bd..78def42818 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -33,7 +33,7 @@ public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2128910021" ) @Export("init") @@ -44,7 +44,7 @@ public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-14" ) @Export("open") @@ -74,7 +74,7 @@ public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1868944096" ) @Export("position") @@ -105,7 +105,7 @@ public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1900446281" ) @Export("close") @@ -119,7 +119,7 @@ public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "630637593" ) @Export("discard") diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 89d5af0d68..03983ae9d5 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -14,7 +14,7 @@ public class DevicePcmPlayerProvider implements PlayerProvider { static int field435; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhz;" + descriptor = "Lhz;" ) @Export("musicTrack") public static MusicTrack musicTrack; @@ -24,7 +24,7 @@ public class DevicePcmPlayerProvider implements PlayerProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ldt;", + descriptor = "(I)Ldt;", garbageValue = "-1371983171" ) @Export("player") @@ -34,7 +34,7 @@ public class DevicePcmPlayerProvider implements PlayerProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;Ljava/lang/String;I)I", + descriptor = "(Lkn;Ljava/lang/String;I)I", garbageValue = "-420633495" ) public static int method917(Buffer var0, String var1) { @@ -112,7 +112,7 @@ public class DevicePcmPlayerProvider implements PlayerProvider { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;IB)V", + descriptor = "(Lkn;IB)V", garbageValue = "-128" ) public static void method914(Buffer var0, int var1) { @@ -128,7 +128,7 @@ public class DevicePcmPlayerProvider implements PlayerProvider { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIII)I", + descriptor = "(IIII)I", garbageValue = "-422462480" ) @Export("hslToRgb") @@ -155,7 +155,7 @@ public class DevicePcmPlayerProvider implements PlayerProvider { @ObfuscatedName("ie") @ObfuscatedSignature( - signature = "(Lhd;B)Z", + descriptor = "(Lhd;B)Z", garbageValue = "-86" ) @Export("runCs1") diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index b664d96452..ac316ba938 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -13,7 +13,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)[B", + descriptor = "(I)[B", garbageValue = "300747627" ) @Export("get") @@ -26,7 +26,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BB)V", + descriptor = "([BB)V", garbageValue = "92" ) @Export("set") @@ -38,7 +38,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { @ObfuscatedName("gl") @ObfuscatedSignature( - signature = "(Lcc;II)V", + descriptor = "(Lcc;II)V", garbageValue = "1934042219" ) static final void method4090(Actor var0, int var1) { diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 770721fb1a..e122e529a6 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -11,13 +11,13 @@ public class DualNode extends Node { public long keyDual; @ObfuscatedName("co") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("previousDual") public DualNode previousDual; @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("nextDual") public DualNode nextDual; diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 363987d789..d51d67e695 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class DualNodeDeque { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("sentinel") DualNode sentinel; @@ -21,7 +21,7 @@ public final class DualNodeDeque { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgf;)V" + descriptor = "(Lgf;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -37,7 +37,7 @@ public final class DualNodeDeque { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgf;)V" + descriptor = "(Lgf;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -53,7 +53,7 @@ public final class DualNodeDeque { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lgf;" + descriptor = "()Lgf;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 3757bdd34f..faa39a5eb3 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -45,7 +45,7 @@ public class DynamicObject extends Entity { int y; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljm;" + descriptor = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @@ -63,7 +63,7 @@ public class DynamicObject extends Entity { int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLel;)V" + descriptor = "(IIIIIIIZLel;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; @@ -95,7 +95,7 @@ public class DynamicObject extends Entity { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") @@ -158,7 +158,7 @@ public class DynamicObject extends Entity { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "1062154046" ) public static int method2375(int var0) { @@ -172,7 +172,7 @@ public class DynamicObject extends Entity { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;I)V", + descriptor = "(Lkb;I)V", garbageValue = "1312322364" ) static final void method2373(PacketBuffer var0) { @@ -355,7 +355,7 @@ public class DynamicObject extends Entity { @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", + descriptor = "(Ljava/lang/String;I)I", garbageValue = "-627685416" ) @Export("stringCp1252NullTerminatedByteSize") diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 4c5312883a..2a09e7983c 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -21,7 +21,7 @@ public abstract class Entity extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") @@ -42,7 +42,7 @@ public abstract class Entity extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "67" ) public static void method3387() { @@ -51,7 +51,7 @@ public abstract class Entity extends DualNode { @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-1309600698" ) static int method3376(int var0, Script var1, boolean var2) { @@ -328,7 +328,7 @@ public abstract class Entity extends DualNode { @ObfuscatedName("kl") @ObfuscatedSignature( - signature = "(Lhd;I)Z", + descriptor = "(Lhd;I)Z", garbageValue = "-36347772" ) @Export("isComponentHidden") diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index fb5ab51db0..81a93cba62 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class EnumDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; @@ -55,7 +55,7 @@ public class EnumDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "1372956041" ) @Export("decode") @@ -72,7 +72,7 @@ public class EnumDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;IB)V", + descriptor = "(Lkn;IB)V", garbageValue = "63" ) @Export("decodeNext") @@ -112,7 +112,7 @@ public class EnumDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(S)I", + descriptor = "(S)I", garbageValue = "-24655" ) @Export("size") diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index aa6f4ed469..07483677ae 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 81119f6b2e..04fae7d057 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class EvictingDualNodeHashTable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) DualNode field1978; @ObfuscatedName("o") @@ -19,13 +19,13 @@ public final class EvictingDualNodeHashTable { int remainingCapacity; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("hashTable") IterableNodeHashTable hashTable; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ljq;" + descriptor = "Ljq;" ) @Export("deque") IterableDualNodeQueue deque; @@ -45,7 +45,7 @@ public final class EvictingDualNodeHashTable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(J)Lgf;" + descriptor = "(J)Lgf;" ) @Export("get") public DualNode get(long var1) { @@ -71,7 +71,7 @@ public final class EvictingDualNodeHashTable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lgf;J)V" + descriptor = "(Lgf;J)V" ) @Export("put") public void put(DualNode var1, long var2) { diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 829e84241f..66a48625d9 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -31,7 +31,7 @@ public class FaceNormal { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Lgt;II)Lgt;", + descriptor = "([Lgt;II)Lgt;", garbageValue = "-707018179" ) @Export("findEnumerated") @@ -50,7 +50,7 @@ public class FaceNormal { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "223741723" ) static String method3392() { diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index c9c00b8d06..404e6e8fae 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -33,7 +33,7 @@ public final class FloorDecoration { int y; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("entity") public Entity entity; @@ -49,6 +49,6 @@ public final class FloorDecoration { @ObfuscatedName("o") static boolean method2977(long var0) { - return class171.method3571(var0) == 2; + return class171.Entity_unpackType(var0) == 2; } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 16bb516031..8f11b8f4c0 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; @@ -90,7 +90,7 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(S)V", + descriptor = "(S)V", garbageValue = "9136" ) @Export("postDecode") @@ -107,7 +107,7 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1893541080" ) @Export("decode") @@ -124,7 +124,7 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;III)V", + descriptor = "(Lkn;III)V", garbageValue = "965813090" ) @Export("decodeNext") @@ -144,7 +144,7 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "1" ) @Export("setHsl") @@ -211,7 +211,7 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "([BII)I", + descriptor = "([BII)I", garbageValue = "-2091622873" ) public static int method4936(byte[] var0, int var1) { diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 60ab48c31e..48151cb3e3 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -14,19 +14,19 @@ import net.runelite.mapping.ObfuscatedSignature; public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("sh") @ObfuscatedSignature( - signature = "Llp;" + descriptor = "Llp;" ) @Export("masterDisk") static ArchiveDisk masterDisk; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; @@ -71,7 +71,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-33176492" ) @Export("postDecode") @@ -81,7 +81,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;IB)V", + descriptor = "(Lkn;IB)V", garbageValue = "17" ) @Export("decode") @@ -98,7 +98,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;IIB)V", + descriptor = "(Lkn;IIB)V", garbageValue = "-93" ) @Export("decodeNext") @@ -111,7 +111,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-14" ) @Export("setHsl") @@ -188,7 +188,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BI)Llz;", + descriptor = "([BI)Llz;", garbageValue = "619951505" ) @Export("convertJpgToSprite") @@ -212,7 +212,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;ZB)[B", + descriptor = "(Ljava/lang/Object;ZB)[B", garbageValue = "101" ) public static byte[] method4613(Object var0, boolean var1) { @@ -231,7 +231,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Llf;ILjava/lang/String;I)Ljava/lang/String;", + descriptor = "(Llf;ILjava/lang/String;I)Ljava/lang/String;", garbageValue = "-1916318659" ) static String method4612(IterableNodeHashTable var0, int var1, String var2) { @@ -245,7 +245,7 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;IB)Z", + descriptor = "(Ljava/lang/String;IB)Z", garbageValue = "3" ) static boolean method4608(String var0, int var1) { @@ -254,10 +254,11 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "7" ) - public static boolean method4615(int var0) { + @Export("Widget_isItemContainer") + public static boolean Widget_isItemContainer(int var0) { return (var0 >> 30 & 1) != 0; } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index e969fdabb8..a322aa82a5 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -10,37 +10,37 @@ import net.runelite.mapping.ObfuscatedSignature; public class FontName { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; @@ -63,7 +63,7 @@ public class FontName { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Lch;", + descriptor = "(B)Lch;", garbageValue = "-18" ) @Export("worldListStart") @@ -74,7 +74,7 @@ public class FontName { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lhd;II)V", + descriptor = "(Lhd;II)V", garbageValue = "1462159307" ) @Export("Widget_setKeyIgnoreHeld") @@ -92,7 +92,7 @@ public class FontName { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Lfm;III)Ldt;", + descriptor = "(Lfm;III)Ldt;", garbageValue = "273987431" ) public static final PcmPlayer method5519(TaskHandler var0, int var1, int var2) { @@ -139,7 +139,7 @@ public class FontName { @ObfuscatedName("hk") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1542752856" ) @Export("addCancelMenuEntry") diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 25e1e7dda7..5c7f7ab3d0 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Fonts { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; @@ -18,13 +18,13 @@ public class Fonts { static byte[][][] ByteArrayPool_arrays; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("spritesArchive") AbstractArchive spritesArchive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("fontsArchive") AbstractArchive fontsArchive; @@ -33,7 +33,7 @@ public class Fonts { HashMap map; @ObfuscatedSignature( - signature = "(Lic;Lic;)V" + descriptor = "(Lic;Lic;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -43,7 +43,7 @@ public class Fonts { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Lke;B)Ljava/util/HashMap;", + descriptor = "([Lke;B)Ljava/util/HashMap;", garbageValue = "-100" ) @Export("createMap") diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index c4b5b8b658..991beb0911 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -15,13 +15,13 @@ public class Frames extends DualNode { static int menuY; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Les;" + descriptor = "[Les;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Lic;Lic;IZ)V", + descriptor = "(Lic;Lic;IZ)V", garbageValue = "0" ) public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { @@ -55,7 +55,7 @@ public class Frames extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "-107" ) @Export("hasAlphaTransform") @@ -92,7 +92,7 @@ public class Frames extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(CLgz;I)C", + descriptor = "(CLgz;I)C", garbageValue = "-959977971" ) @Export("standardizeChar") @@ -180,7 +180,7 @@ public class Frames extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lic;Lic;III)Lko;", + descriptor = "(Lic;Lic;III)Lko;", garbageValue = "-2070991083" ) public static Font method3394(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { @@ -198,7 +198,7 @@ public class Frames extends DualNode { @ObfuscatedName("gw") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "150036680" ) static final void method3396() { @@ -249,7 +249,7 @@ public class Frames extends DualNode { @ObfuscatedName("ku") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-179061034" ) static final void method3399() { diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 547de358f0..19ec1b64eb 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -16,7 +16,7 @@ public class Friend extends Buddy { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkl;I)I", + descriptor = "(Lkl;I)I", garbageValue = "-1139109616" ) @Export("compareToFriend") @@ -44,7 +44,7 @@ public class Friend extends Buddy { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljf;I)I", + descriptor = "(Ljf;I)I", garbageValue = "334051838" ) @Export("compareTo_user") @@ -58,7 +58,7 @@ public class Friend extends Buddy { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lch;I)V", + descriptor = "(Lch;I)V", garbageValue = "-463373379" ) @Export("changeWorld") diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 99b9bd980d..e3a3c7f93a 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class FriendLoginUpdate extends Link { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfb;" + descriptor = "Lfb;" ) @Export("clock") protected static Clock clock; @@ -20,7 +20,7 @@ public class FriendLoginUpdate extends Link { public int field3667; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lkq;" + descriptor = "Lkq;" ) @Export("username") public Username username; @@ -29,7 +29,7 @@ public class FriendLoginUpdate extends Link { public short world; @ObfuscatedSignature( - signature = "(Lkq;I)V" + descriptor = "(Lkq;I)V" ) FriendLoginUpdate(Username var1, int var2) { this.field3667 = (int)(MilliClock.currentTimeMillis() / 1000L); @@ -39,7 +39,7 @@ public class FriendLoginUpdate extends Link { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgz;I)I", + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgz;I)I", garbageValue = "1283981780" ) @Export("compareStrings") diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 1e93fa5c5d..b0a6afbb9c 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -15,19 +15,19 @@ public class FriendSystem { public static long field1093; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) @Export("loginType") final LoginType loginType; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lki;" + descriptor = "Lki;" ) @Export("friendsList") public final FriendsList friendsList; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljw;" + descriptor = "Ljw;" ) @Export("ignoreList") public final IgnoreList ignoreList; @@ -38,7 +38,7 @@ public class FriendSystem { int field1094; @ObfuscatedSignature( - signature = "(Lmo;)V" + descriptor = "(Lmo;)V" ) FriendSystem(LoginType var1) { this.field1094 = 0; @@ -49,7 +49,7 @@ public class FriendSystem { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-100444560" ) boolean method1923() { @@ -58,7 +58,7 @@ public class FriendSystem { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(S)V", + descriptor = "(S)V", garbageValue = "-20972" ) final void method1981() { @@ -67,7 +67,7 @@ public class FriendSystem { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-11966056" ) @Export("readUpdate") @@ -95,7 +95,7 @@ public class FriendSystem { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "892305960" ) @Export("processFriendUpdates") @@ -118,7 +118,7 @@ public class FriendSystem { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2071426788" ) @Export("clear") @@ -130,7 +130,7 @@ public class FriendSystem { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkq;ZI)Z", + descriptor = "(Lkq;ZI)Z", garbageValue = "1031830697" ) @Export("isFriended") @@ -146,7 +146,7 @@ public class FriendSystem { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkq;B)Z", + descriptor = "(Lkq;B)Z", garbageValue = "41" ) @Export("isIgnored") @@ -160,7 +160,7 @@ public class FriendSystem { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "1198783878" ) @Export("addFriend") @@ -188,7 +188,7 @@ public class FriendSystem { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "276950128" ) @Export("friendsListIsFull") @@ -198,7 +198,7 @@ public class FriendSystem { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "467200787" ) @Export("addIgnore") @@ -232,7 +232,7 @@ public class FriendSystem { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-516025853" ) @Export("canAddIgnore") @@ -242,7 +242,7 @@ public class FriendSystem { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-964450223" ) @Export("removeFriend") @@ -280,7 +280,7 @@ public class FriendSystem { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1026417394" ) @Export("removeIgnore") @@ -303,7 +303,7 @@ public class FriendSystem { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkq;B)Z", + descriptor = "(Lkq;B)Z", garbageValue = "-1" ) @Export("isFriendAndHasWorld") @@ -314,11 +314,11 @@ public class FriendSystem { @ObfuscatedName("kq") @ObfuscatedSignature( - signature = "(Lhd;B)Lhd;", + descriptor = "(Lhd;B)Lhd;", garbageValue = "74" ) static Widget method1994(Widget var0) { - int var1 = WorldMapDecoration.method402(KeyHandler.getWidgetClickMask(var0)); + int var1 = WorldMapDecoration.method402(KeyHandler.getWidgetFlags(var0)); if (var1 == 0) { return null; } else { diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index ea2e89fab8..5eaa841f21 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class FriendsList extends UserList { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) @Export("loginType") final LoginType loginType; @@ -20,13 +20,13 @@ public class FriendsList extends UserList { int field3648; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljn;" + descriptor = "Ljn;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Lmo;)V" + descriptor = "(Lmo;)V" ) public FriendsList(LoginType var1) { super(400); @@ -37,7 +37,7 @@ public class FriendsList extends UserList { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljf;", + descriptor = "(I)Ljf;", garbageValue = "551595115" ) @Export("newInstance") @@ -47,7 +47,7 @@ public class FriendsList extends UserList { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljf;", + descriptor = "(II)[Ljf;", garbageValue = "1959965595" ) @Export("newTypedArray") @@ -57,7 +57,7 @@ public class FriendsList extends UserList { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkq;ZI)Z", + descriptor = "(Lkq;ZI)Z", garbageValue = "2027561031" ) @Export("isFriended") @@ -72,7 +72,7 @@ public class FriendsList extends UserList { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-1956355163" ) @Export("read") diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 505284d1a8..62d566883c 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -16,7 +16,7 @@ public class GZipDecompressor { } @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "1000000" ) GZipDecompressor(int var1, int var2, int var3) { @@ -24,7 +24,7 @@ public class GZipDecompressor { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;[BI)V", + descriptor = "(Lkn;[BI)V", garbageValue = "1767160394" ) @Export("decompress") diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index d6805d5fdb..e3a9b356f6 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -11,31 +11,31 @@ import net.runelite.mapping.ObfuscatedSignature; public class GameBuild { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lij;" + descriptor = "Lij;" ) @Export("LIVE") public static final GameBuild LIVE; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lij;" + descriptor = "Lij;" ) @Export("BUILDLIVE") public static final GameBuild BUILDLIVE; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lij;" + descriptor = "Lij;" ) @Export("RC") public static final GameBuild RC; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lij;" + descriptor = "Lij;" ) @Export("WIP") public static final GameBuild WIP; @ObfuscatedName("du") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive13") static Archive archive13; @@ -63,7 +63,7 @@ public class GameBuild { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)[Lgl;", + descriptor = "(I)[Lgl;", garbageValue = "-290108173" ) public static class194[] method4291() { @@ -72,7 +72,7 @@ public class GameBuild { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/io/File;", + descriptor = "(Ljava/lang/String;B)Ljava/io/File;", garbageValue = "-93" ) @Export("getFile") diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 50090f07f7..cfebfa7743 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class GameObject { @ObfuscatedName("di") @ObfuscatedSignature( - signature = "Llj;" + descriptor = "Llj;" ) @Export("js5Socket") static AbstractSocket js5Socket; @@ -45,7 +45,7 @@ public final class GameObject { int centerY; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("entity") public Entity entity; @@ -104,7 +104,7 @@ public final class GameObject { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "1896739320" ) @Export("isCharAlphabetic") diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 4b7b927e32..526a5b5fe0 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -32,7 +32,7 @@ import net.runelite.mapping.ObfuscatedSignature; public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lbn;" + descriptor = "Lbn;" ) @Export("gameShell") static GameShell gameShell; @@ -77,7 +77,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene protected static int fps; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("options_buttons_2Sprite") static IndexedSprite options_buttons_2Sprite; @@ -186,7 +186,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene volatile long field489; @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lbh;" + descriptor = "Lbh;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; @@ -234,7 +234,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-2030982939" ) @Export("setMaxCanvasSize") @@ -249,7 +249,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;I)V", + descriptor = "(Ljava/lang/Object;I)V", garbageValue = "-876824322" ) @Export("post") @@ -268,7 +268,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lfv;", + descriptor = "(I)Lfv;", garbageValue = "-192453473" ) @Export("mouseWheel") @@ -283,7 +283,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-981291570" ) @Export("setUpClipboard") @@ -293,7 +293,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-2023298912" ) @Export("clipboardSetString") @@ -303,7 +303,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-316862367" ) @Export("setUpKeyboard") @@ -317,7 +317,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "196707341" ) @Export("setUpMouse") @@ -327,7 +327,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-752017845" ) @Export("resizeCanvas") @@ -365,7 +365,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1805213007" ) @Export("resizeGame") @@ -373,7 +373,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1664066560" ) @Export("clearBackground") @@ -418,7 +418,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "97" ) @Export("replaceCanvas") @@ -451,7 +451,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "-946150877" ) @Export("startThread") @@ -487,7 +487,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "799710409" ) @Export("addCanvas") @@ -537,7 +537,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "424530917" ) @Export("checkHost") @@ -569,7 +569,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-311013157" ) @Export("clientTick") @@ -590,7 +590,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "553684525" ) @Export("graphicsTick") @@ -633,7 +633,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "73839779" ) final void method1004() { @@ -647,7 +647,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2043772276" ) final void method1029() { @@ -656,7 +656,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-109609137" ) @Export("kill") @@ -694,7 +694,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "108465933" ) @Export("setUp") @@ -702,7 +702,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "202919973" ) @Export("doCycle") @@ -710,7 +710,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(ZS)V", + descriptor = "(ZS)V", garbageValue = "255" ) @Export("draw") @@ -718,7 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1432958229" ) @Export("kill0") @@ -726,7 +726,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(ILjava/lang/String;ZS)V", + descriptor = "(ILjava/lang/String;ZS)V", garbageValue = "-6486" ) @Export("drawInitial") @@ -782,7 +782,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1038355483" ) protected final void method1017() { @@ -793,7 +793,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)V", + descriptor = "(Ljava/lang/String;S)V", garbageValue = "23979" ) @Export("error") @@ -812,7 +812,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(I)Ljava/awt/Container;", + descriptor = "(I)Ljava/awt/Container;", garbageValue = "1395544876" ) @Export("container") @@ -822,7 +822,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(S)Llv;", + descriptor = "(S)Llv;", garbageValue = "9055" ) @Export("getFrameContentBounds") @@ -841,7 +841,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-2133416306" ) @Export("hasFrame") @@ -851,7 +851,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-453140820" ) protected abstract void vmethod1570(); @@ -987,7 +987,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", garbageValue = "968663760" ) @Export("getPreferencesFile") @@ -1028,7 +1028,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lic;III)Llz;", + descriptor = "(Lic;III)Llz;", garbageValue = "1598756055" ) @Export("SpriteBuffer_getSprite") diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index ee10d43580..e6713255e3 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -15,13 +15,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class GrandExchangeEvent { @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("worldSelectArrows") static IndexedSprite[] worldSelectArrows; @ObfuscatedName("da") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive8") static Archive archive8; @@ -39,7 +39,7 @@ public class GrandExchangeEvent { public final long age; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ld;" + descriptor = "Ld;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; @@ -51,7 +51,7 @@ public class GrandExchangeEvent { String previousOfferName; @ObfuscatedSignature( - signature = "(Lkn;BI)V" + descriptor = "(Lkn;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -72,7 +72,7 @@ public class GrandExchangeEvent { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "-1910615045" ) @Export("getOfferName") @@ -82,7 +82,7 @@ public class GrandExchangeEvent { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "-966567999" ) @Export("getPreviousOfferName") @@ -92,7 +92,7 @@ public class GrandExchangeEvent { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "144078284" ) static final void method153(int var0, int var1, int var2, int var3) { @@ -123,7 +123,7 @@ public class GrandExchangeEvent { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lbn;I)V", + descriptor = "(Lbn;I)V", garbageValue = "-1052517513" ) @Export("doCycleTitle") @@ -688,7 +688,7 @@ public class GrandExchangeEvent { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "-55" ) @Export("Messages_getHistorySize") @@ -699,7 +699,7 @@ public class GrandExchangeEvent { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1823027767" ) static void method158() { @@ -713,7 +713,7 @@ public class GrandExchangeEvent { @ObfuscatedName("hx") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1963470031" ) static final void method155(int var0) { @@ -730,7 +730,7 @@ public class GrandExchangeEvent { @ObfuscatedName("jp") @ObfuscatedSignature( - signature = "(Lhd;I)Lhd;", + descriptor = "(Lhd;I)Lhd;", garbageValue = "-1293330124" ) static Widget method157(Widget var0) { diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 08ad8c315c..233d4c8095 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -35,7 +35,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lkn;Z)V", + descriptor = "(Lkn;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -59,7 +59,7 @@ public class GrandExchangeEvents { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;ZI)V", + descriptor = "(Ljava/util/Comparator;ZI)V", garbageValue = "372755845" ) @Export("sort") @@ -74,7 +74,7 @@ public class GrandExchangeEvents { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "819758583" ) public static boolean method148(char var0) { diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 25a6d45989..cf6fa0f997 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -10,12 +10,12 @@ import net.runelite.rs.ScriptOpcodes; public class GrandExchangeOffer { @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Llv;" + descriptor = "Llv;" ) static Bounds field87; @ObfuscatedName("db") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive4") static Archive archive4; @@ -57,7 +57,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lkn;Z)V", + descriptor = "(Lkn;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -71,7 +71,7 @@ public class GrandExchangeOffer { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "271165601" ) @Export("status") @@ -81,7 +81,7 @@ public class GrandExchangeOffer { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-2130764898" ) @Export("type") @@ -91,7 +91,7 @@ public class GrandExchangeOffer { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-308953741" ) void method172(int var1) { @@ -101,7 +101,7 @@ public class GrandExchangeOffer { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "1" ) void method173(int var1) { @@ -114,7 +114,7 @@ public class GrandExchangeOffer { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([Lch;II[I[II)V", + descriptor = "([Lch;II[I[II)V", garbageValue = "-1520869912" ) @Export("sortWorlds") @@ -226,7 +226,7 @@ public class GrandExchangeOffer { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-2096234716" ) static int method194(int var0, Script var1, boolean var2) { @@ -264,7 +264,7 @@ public class GrandExchangeOffer { @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-1566307415" ) static int method176(int var0) { @@ -273,7 +273,7 @@ public class GrandExchangeOffer { @ObfuscatedName("hp") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1931279198" ) @Export("Widget_runOnTargetLeave") @@ -294,7 +294,7 @@ public class GrandExchangeOffer { @ObfuscatedName("jm") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "2119897094" ) static void method189(int var0, int var1) { @@ -304,7 +304,7 @@ public class GrandExchangeOffer { @ObfuscatedName("jf") @ObfuscatedSignature( - signature = "(IIIILlz;Lhh;B)V", + descriptor = "(IIIILlz;Lhh;B)V", garbageValue = "105" ) @Export("drawSpriteOnMinimap") @@ -329,7 +329,7 @@ public class GrandExchangeOffer { @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1908400826" ) @Export("Clan_leaveChat") @@ -341,7 +341,7 @@ public class GrandExchangeOffer { @ObfuscatedName("kj") @ObfuscatedSignature( - signature = "(IIIZB)V", + descriptor = "(IIIZB)V", garbageValue = "43" ) public static void method191(int var0, int var1, int var2, boolean var3) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index d50370e60f..c49c186a3f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -16,7 +16,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator { static int widgetDragDuration; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfm;" + descriptor = "Lfm;" ) @Export("taskHandler") protected static TaskHandler taskHandler; @@ -29,7 +29,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ls;Ls;I)I", + descriptor = "(Ls;Ls;I)I", garbageValue = "-2089427647" ) @Export("compare_bridged") @@ -47,7 +47,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator { @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "(IIIIIIII)V", + descriptor = "(IIIIIIII)V", garbageValue = "1928902850" ) static final void method224(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 995cc6f20d..af56203e05 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -9,20 +9,20 @@ import net.runelite.mapping.ObfuscatedSignature; final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("fv") @ObfuscatedSignature( - signature = "Lko;" + descriptor = "Lko;" ) @Export("fontBold12") static Font fontBold12; @ObfuscatedName("gt") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("compass") static Sprite compass; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ls;Ls;I)I", + descriptor = "(Ls;Ls;I)I", garbageValue = "1584423872" ) @Export("compare_bridged") @@ -40,7 +40,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Ljc;", + descriptor = "(I)[Ljc;", garbageValue = "491674021" ) static HorizontalAlignment[] method207() { @@ -49,7 +49,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-678921308" ) static void method213() { @@ -59,7 +59,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("kt") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-350266063" ) static void method214(Buffer var0, int var1) { @@ -74,7 +74,7 @@ final class GrandExchangeOfferNameComparator implements Comparator { @ObfuscatedName("kv") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2098531910" ) static void method206() { diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 0dd2944994..5107a4a6b9 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -23,7 +23,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ls;Ls;I)I", + descriptor = "(Ls;Ls;I)I", garbageValue = "646157510" ) @Export("compare_bridged") @@ -55,7 +55,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "987190791" ) static int method1342(int var0, Script var1, boolean var2) { @@ -116,7 +116,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(Ljm;IIII)V", + descriptor = "(Ljm;IIII)V", garbageValue = "1251688899" ) @Export("addSequenceSoundEffect") diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 6239d18d48..7bf9968c6e 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -12,7 +12,7 @@ import netscape.javascript.JSObject; final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ls;Ls;I)I", + descriptor = "(Ls;Ls;I)I", garbageValue = "-1370720727" ) @Export("compare_bridged") @@ -30,7 +30,7 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", + descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", garbageValue = "-68" ) static boolean method165(String var0, int var1, String var2) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 2e5f75207d..e6e6451651 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature; final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ls;Ls;B)I", + descriptor = "(Ls;Ls;B)I", garbageValue = "0" ) @Export("compare_bridged") @@ -29,7 +29,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Lic;B)V", + descriptor = "(Lic;Lic;B)V", garbageValue = "15" ) public static void method195(AbstractArchive var0, AbstractArchive var1) { @@ -40,7 +40,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Z", + descriptor = "(Ljava/lang/String;I)Z", garbageValue = "-1062830390" ) static boolean method204(String var0) { @@ -58,7 +58,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Ljg;S)Z", + descriptor = "(Ljg;S)Z", garbageValue = "255" ) static boolean method202(ObjectDefinition var0) { @@ -81,7 +81,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedName("ix") @ObfuscatedSignature( - signature = "([Lhd;IIIZB)V", + descriptor = "([Lhd;IIIZB)V", garbageValue = "0" ) @Export("resizeInterface") diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index e3b6dbe94c..93709483ec 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -10,13 +10,13 @@ import net.runelite.rs.ScriptOpcodes; final class GrandExchangeOfferWorldComparator implements Comparator { @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) static StudioGame field54; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ls;Ls;B)I", + descriptor = "(Ls;Ls;B)I", garbageValue = "-1" ) @Export("compare_bridged") @@ -34,7 +34,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1613064985" ) static int method137(int var0, Script var1, boolean var2) { @@ -85,7 +85,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator { var4.actions = null; return 1; } else if (var0 == 1308) { - var4.field2744 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; return 1; } else if (var0 == 1309) { --UrlRequester.Interpreter_intStackSize; diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 5060616be0..c40cfeb59c 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -82,7 +82,7 @@ public class GraphicsDefaults { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;B)V", + descriptor = "(Lic;B)V", garbageValue = "0" ) @Export("decode") diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index e09cfd9b83..2151a36653 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -14,7 +14,7 @@ public final class GraphicsObject extends Entity { static long field1139; @ObfuscatedName("dz") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive10") static Archive archive10; @@ -56,7 +56,7 @@ public final class GraphicsObject extends Entity { int height; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljm;" + descriptor = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @@ -98,7 +98,7 @@ public final class GraphicsObject extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1084299452" ) @Export("advance") @@ -120,7 +120,7 @@ public final class GraphicsObject extends Entity { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 67d6c3713d..d83f6f8564 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -11,25 +11,25 @@ import net.runelite.mapping.ObfuscatedSignature; public class HealthBar extends Node { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lik;" + descriptor = "Lik;" ) @Export("definition") HealthBarDefinition definition; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljx;" + descriptor = "Ljx;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Lik;)V" + descriptor = "(Lik;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); @@ -38,7 +38,7 @@ public class HealthBar extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIIB)V", + descriptor = "(IIIIB)V", garbageValue = "-61" ) @Export("put") @@ -74,7 +74,7 @@ public class HealthBar extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lcb;", + descriptor = "(II)Lcb;", garbageValue = "-200581175" ) @Export("get") @@ -99,7 +99,7 @@ public class HealthBar extends Node { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1424696628" ) @Export("isEmpty") @@ -109,7 +109,7 @@ public class HealthBar extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;III)V", + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", garbageValue = "1011181344" ) public static void method2137(String var0, String var1, int var2, int var3) throws IOException { @@ -330,7 +330,7 @@ public class HealthBar extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;IIB)[Llh;", + descriptor = "(Lic;IIB)[Llh;", garbageValue = "-91" ) public static IndexedSprite[] method2125(AbstractArchive var0, int var1, int var2) { @@ -348,7 +348,7 @@ public class HealthBar extends Node { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-631398790" ) public static void method2133() { @@ -357,7 +357,7 @@ public class HealthBar extends Node { @ObfuscatedName("eb") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-57" ) @Export("load") @@ -733,7 +733,7 @@ public class HealthBar extends Node { @ObfuscatedName("go") @ObfuscatedSignature( - signature = "(IIIS)V", + descriptor = "(IIIS)V", garbageValue = "3305" ) @Export("worldToScreen") diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 6495c3e949..f698b2a033 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -9,25 +9,25 @@ import net.runelite.mapping.ObfuscatedSignature; public class HealthBarDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("HitSplatDefinition_spritesArchive") public static AbstractArchive HitSplatDefinition_spritesArchive; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("HealthBarDefinition_cachedSprites") static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; @@ -115,7 +115,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-2036090908" ) @Export("decode") @@ -132,7 +132,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-2145351852" ) @Export("decodeNext") @@ -165,7 +165,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Llz;", + descriptor = "(I)Llz;", garbageValue = "65535" ) @Export("getFrontSprite") @@ -189,7 +189,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Llz;", + descriptor = "(I)Llz;", garbageValue = "1675324789" ) @Export("getBackSprite") @@ -213,7 +213,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIB)I", + descriptor = "(IIB)I", garbageValue = "-32" ) static int method4673(int var0, int var1) { @@ -227,7 +227,7 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedName("kd") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", garbageValue = "-1975463268" ) static String method4669(String var0, boolean var1) { diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index ec6264e43c..317923f4a1 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -10,7 +10,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class HealthBarUpdate extends Node { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldh;" + descriptor = "Ldh;" ) @Export("pcmPlayerProvider") static PlayerProvider pcmPlayerProvider; @@ -52,7 +52,7 @@ public class HealthBarUpdate extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "880697270" ) @Export("set") diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 7b1ef0720d..8ade6bed37 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -9,36 +9,36 @@ import net.runelite.mapping.ObfuscatedSignature; public class HitSplatDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) public static AbstractArchive field3356; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("HitSplatDefinition_fontsArchive") public static AbstractArchive HitSplatDefinition_fontsArchive; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; @@ -154,7 +154,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "-108" ) @Export("decode") @@ -171,7 +171,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-2104480969" ) @Export("decodeNext") @@ -240,7 +240,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(S)Ljs;", + descriptor = "(S)Ljs;", garbageValue = "24687" ) @Export("transform") @@ -283,7 +283,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", + descriptor = "(II)Ljava/lang/String;", garbageValue = "2134005517" ) @Export("getString") @@ -302,7 +302,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Llz;", + descriptor = "(B)Llz;", garbageValue = "85" ) public Sprite method4755() { @@ -325,7 +325,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Llz;", + descriptor = "(I)Llz;", garbageValue = "-2111693825" ) public Sprite method4756() { @@ -348,7 +348,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)Llz;", + descriptor = "(B)Llz;", garbageValue = "1" ) public Sprite method4752() { @@ -371,7 +371,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Llz;", + descriptor = "(I)Llz;", garbageValue = "148088504" ) public Sprite method4763() { @@ -394,7 +394,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Lko;", + descriptor = "(B)Lko;", garbageValue = "-13" ) @Export("getFont") @@ -418,7 +418,7 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;B)V", + descriptor = "(Lkb;B)V", garbageValue = "121" ) @Export("updatePlayer") diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index b4494ac759..2c655f4be1 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -9,18 +9,18 @@ import net.runelite.mapping.ObfuscatedSignature; public enum HorizontalAlignment implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljc;" + descriptor = "Ljc;" ) field3488(2, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljc;" + descriptor = "Ljc;" ) @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ljc;" + descriptor = "Ljc;" ) field3492(0, 2); @@ -47,7 +47,7 @@ public enum HorizontalAlignment implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index a7007c2285..18bb814a14 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -9,7 +9,7 @@ import net.runelite.rs.ScriptOpcodes; public class Huffman { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("musicTrackArchive") public static AbstractArchive musicTrackArchive; @@ -108,7 +108,7 @@ public class Huffman { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BII[BII)I", + descriptor = "([BII[BII)I", garbageValue = "1506774655" ) @Export("compress") @@ -159,7 +159,7 @@ public class Huffman { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BI[BIII)I", + descriptor = "([BI[BIII)I", garbageValue = "-417422425" ) @Export("decompress") @@ -303,7 +303,7 @@ public class Huffman { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-2030952139" ) static int method4099(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 8b4a4ed8fd..c2625ba78a 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class IgnoreList extends UserList { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Lmo;)V" + descriptor = "(Lmo;)V" ) public IgnoreList(LoginType var1) { super(400); @@ -23,7 +23,7 @@ public class IgnoreList extends UserList { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljf;", + descriptor = "(I)Ljf;", garbageValue = "551595115" ) @Export("newInstance") @@ -33,7 +33,7 @@ public class IgnoreList extends UserList { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljf;", + descriptor = "(II)[Ljf;", garbageValue = "1959965595" ) @Export("newTypedArray") @@ -43,7 +43,7 @@ public class IgnoreList extends UserList { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;IB)V", + descriptor = "(Lkn;IB)V", garbageValue = "77" ) @Export("read") diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index d0cc731af1..c12d42adb0 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -19,7 +19,7 @@ public class Ignored extends User { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkc;I)I", + descriptor = "(Lkc;I)I", garbageValue = "-857572865" ) @Export("compareTo_ignored") @@ -29,7 +29,7 @@ public class Ignored extends User { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljf;I)I", + descriptor = "(Ljf;I)I", garbageValue = "334051838" ) @Export("compareTo_user") diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 6850733a63..8df3261823 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -33,49 +33,49 @@ public class Instrument { static int[] Instrument_pitchBaseSteps; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("pitch") SoundEnvelope pitch; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("volume") SoundEnvelope volume; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("release") SoundEnvelope release; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("attack") SoundEnvelope attack; @@ -96,13 +96,13 @@ public class Instrument { int delayDecay; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lda;" + descriptor = "Lda;" ) @Export("filter") AudioFilter filter; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lds;" + descriptor = "Lds;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; @@ -369,7 +369,7 @@ public class Instrument { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) @Export("decode") final void decode(Buffer var1) { diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index aee4fde898..5638ce6808 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -34,7 +34,7 @@ public class IntHashTable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "-57" ) @Export("get") diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 9ad5735860..551c53b0ec 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -30,7 +30,7 @@ public class InterfaceParent extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)Llz;", + descriptor = "(IIIB)Llz;", garbageValue = "-72" ) static Sprite method1233(int var0, int var1, int var2) { @@ -41,7 +41,7 @@ public class InterfaceParent extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lbu;I)V", + descriptor = "(Lbu;I)V", garbageValue = "-764301386" ) @Export("runScriptEvent") diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 4da4cdaea1..d4a195dd48 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -33,7 +33,7 @@ public class Interpreter { static int Interpreter_frameDepth; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Lbp;" + descriptor = "[Lbp;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; @@ -72,7 +72,7 @@ public class Interpreter { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IILga;Lfz;S)Z", + descriptor = "(IILga;Lfz;S)Z", garbageValue = "-8766" ) static final boolean method2112(int var0, int var1, RouteStrategy var2, CollisionMap var3) { diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index e42481558d..98d5d4e8d6 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -10,13 +10,13 @@ import net.runelite.rs.ScriptOpcodes; public class InvDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("InvDefinition_archive") public static AbstractArchive InvDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; @@ -37,7 +37,7 @@ public class InvDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "-52" ) @Export("decode") @@ -54,7 +54,7 @@ public class InvDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "2103513845" ) @Export("decodeNext") @@ -67,7 +67,7 @@ public class InvDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1737706956" ) static int method4530(int var0, Script var1, boolean var2) { @@ -256,7 +256,7 @@ public class InvDefinition extends DualNode { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ZB)V", + descriptor = "(ZB)V", garbageValue = "93" ) public static void method4523(boolean var0) { diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index c23bce97f9..bb6eacf031 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -51,7 +51,7 @@ public final class IsaacCipher { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-51" ) @Export("nextInt") @@ -66,7 +66,7 @@ public final class IsaacCipher { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1026117939" ) public final int method6467() { @@ -80,7 +80,7 @@ public final class IsaacCipher { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2064479197" ) @Export("generateMoreResults") @@ -111,7 +111,7 @@ public final class IsaacCipher { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1036873606" ) final void method6476() { diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 7138a1892d..5dddd8eed8 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -9,19 +9,19 @@ import net.runelite.mapping.ObfuscatedSignature; public class ItemContainer extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("itemContainers") static NodeHashTable itemContainers; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("rightTitleSprite") static Sprite rightTitleSprite; @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Llv;" + descriptor = "Llv;" ) static Bounds field567; @ObfuscatedName("ma") @@ -48,7 +48,7 @@ public class ItemContainer extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lls;", + descriptor = "(II)Lls;", garbageValue = "-1724420240" ) public static PrivateChatMode method1232(int var0) { @@ -67,7 +67,7 @@ public class ItemContainer extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", + descriptor = "(II)Ljava/lang/String;", garbageValue = "1507611056" ) @Export("colorStartTag") @@ -77,7 +77,7 @@ public class ItemContainer extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Ljr;", + descriptor = "(II)Ljr;", garbageValue = "2131303603" ) @Export("getEnum") @@ -99,7 +99,7 @@ public class ItemContainer extends Node { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lch;Lch;IZIZI)I", + descriptor = "(Lch;Lch;IZIZI)I", garbageValue = "-1532099004" ) static int method1225(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index a3abe66595..ea312fd26f 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class ItemDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("ItemDefinition_modelArchive") static AbstractArchive ItemDefinition_modelArchive; @@ -18,19 +18,19 @@ public class ItemDefinition extends DualNode { static byte[][] SpriteBuffer_pixels; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ItemDefinition_cached") public static EvictingDualNodeHashTable ItemDefinition_cached; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ItemDefinition_cachedModels") public static EvictingDualNodeHashTable ItemDefinition_cachedModels; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; @@ -252,7 +252,7 @@ public class ItemDefinition extends DualNode { public int team; @ObfuscatedName("be") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -333,7 +333,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-196322626" ) @Export("post") @@ -342,7 +342,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "1671660410" ) @Export("decode") @@ -359,7 +359,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "2109543922" ) @Export("decodeNext") @@ -487,7 +487,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljo;Ljo;I)V", + descriptor = "(Ljo;Ljo;I)V", garbageValue = "1175603747" ) @Export("genCert") @@ -511,7 +511,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljo;Ljo;B)V", + descriptor = "(Ljo;Ljo;B)V", garbageValue = "12" ) @Export("genBought") @@ -555,7 +555,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljo;Ljo;I)V", + descriptor = "(Ljo;Ljo;I)V", garbageValue = "-1279749968" ) @Export("genPlaceholder") @@ -580,7 +580,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IB)Lek;", + descriptor = "(IB)Lek;", garbageValue = "3" ) @Export("getModelData") @@ -626,7 +626,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(II)Lef;", + descriptor = "(II)Lef;", garbageValue = "1775717489" ) @Export("getModel") @@ -680,7 +680,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)Ljo;", + descriptor = "(II)Ljo;", garbageValue = "-539705094" ) @Export("getCountObj") @@ -704,7 +704,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ZB)Z", + descriptor = "(ZB)Z", garbageValue = "118" ) @Export("hasNoValidModel") @@ -740,7 +740,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(ZI)Lek;", + descriptor = "(ZI)Lek;", garbageValue = "-952045746" ) public final ModelData method4839(boolean var1) { @@ -796,7 +796,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ZI)Z", + descriptor = "(ZI)Z", garbageValue = "-209072389" ) public final boolean method4840(boolean var1) { @@ -825,7 +825,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(ZB)Lek;", + descriptor = "(ZB)Lek;", garbageValue = "52" ) public final ModelData method4841(boolean var1) { @@ -865,7 +865,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIB)I", + descriptor = "(IIB)I", garbageValue = "2" ) @Export("getIntParam") @@ -875,7 +875,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", garbageValue = "2076909967" ) @Export("getStringParam") @@ -885,7 +885,7 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "269605013" ) @Export("getShiftClickIndex") diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index e34ab98db2..22949da632 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("sentinel") public DualNode sentinel; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("head") DualNode head; @@ -37,7 +37,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgf;)V" + descriptor = "(Lgf;)V" ) @Export("add") public void add(DualNode var1) { @@ -53,7 +53,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lgf;" + descriptor = "()Lgf;" ) @Export("removeLast") public DualNode removeLast() { @@ -68,7 +68,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lgf;" + descriptor = "()Lgf;" ) @Export("last") public DualNode last() { @@ -77,7 +77,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lgf;)Lgf;" + descriptor = "(Lgf;)Lgf;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -99,7 +99,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lgf;" + descriptor = "()Lgf;" ) @Export("previous") public DualNode previous() { @@ -119,7 +119,7 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lgf;Lgf;)V" + descriptor = "(Lgf;Lgf;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 4add6e0f02..db766523d8 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -9,25 +9,25 @@ import net.runelite.mapping.ObfuscatedSignature; public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljq;" + descriptor = "Ljq;" ) @Export("queue") IterableDualNodeQueue queue; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("head") DualNode head; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgf;" + descriptor = "Lgf;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Ljq;)V" + descriptor = "(Ljq;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 36bc483374..fd94b6306d 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -10,13 +10,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("sentinel") Node sentinel; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) Node field3565; @@ -37,7 +37,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgr;)V" + descriptor = "(Lgr;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -53,7 +53,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lgr;)V" + descriptor = "(Lgr;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -69,7 +69,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("last") public Node last() { @@ -78,7 +78,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lgr;)Lgr;" + descriptor = "(Lgr;)Lgr;" ) Node method5064(Node var1) { Node var2; @@ -99,7 +99,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("previous") public Node previous() { @@ -131,7 +131,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()[Lgr;" + descriptor = "()[Lgr;" ) Node[] method5010() { Node[] var1 = new Node[this.method5008()]; @@ -146,7 +146,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lgr;)Z" + descriptor = "(Lgr;)Z" ) boolean method5012(Node var1) { this.addFirst(var1); @@ -221,7 +221,7 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lgr;Lgr;)V" + descriptor = "(Lgr;Lgr;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 0fb4451f7e..b9389e96e9 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -9,24 +9,24 @@ import net.runelite.mapping.ObfuscatedSignature; public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljx;" + descriptor = "Ljx;" ) @Export("deque") IterableNodeDeque deque; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) Node field3573; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Ljx;)V" + descriptor = "(Ljx;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; @@ -35,7 +35,7 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljx;)V" + descriptor = "(Ljx;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 1572653f5c..ea59fbb89e 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -12,19 +12,19 @@ public final class IterableNodeHashTable implements Iterable { int size; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lgr;" + descriptor = "[Lgr;" ) @Export("buckets") Node[] buckets; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("currentGet") Node currentGet; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("current") Node current; @@ -47,7 +47,7 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(J)Lgr;" + descriptor = "(J)Lgr;" ) @Export("get") public Node get(long var1) { @@ -67,7 +67,7 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgr;J)V" + descriptor = "(Lgr;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -105,7 +105,7 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("first") public Node first() { @@ -115,7 +115,7 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 2893a1ceb9..86071aefe5 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("hashTable") IterableNodeHashTable hashTable; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("head") Node head; @@ -24,13 +24,13 @@ public class IterableNodeHashTableIterator implements Iterator { int index; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Llf;)V" + descriptor = "(Llf;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 4df637ab30..e9d22d0719 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -15,25 +15,25 @@ public class JagexCache { static File cacheDir; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lmn;" + descriptor = "Lmn;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lmn;" + descriptor = "Lmn;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lmn;" + descriptor = "Lmn;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "[Lmn;" + descriptor = "[Lmn;" ) @Export("JagexCache_idxFiles") public static BufferedFile[] JagexCache_idxFiles; @@ -48,7 +48,7 @@ public class JagexCache { @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "201331676" ) static final void method3625() { diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 8fdd245d9d..97a6338101 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -13,13 +13,13 @@ import net.runelite.mapping.ObfuscatedSignature; public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lbg;" + descriptor = "Lbg;" ) @Export("KeyHandler_instance") static KeyHandler KeyHandler_instance; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) static Widget field407; @ObfuscatedName("ck") @@ -74,13 +74,13 @@ public final class KeyHandler implements KeyListener, FocusListener { static int[] KeyHandler_keyCodes; @ObfuscatedName("gw") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("headIconPrayerSprites") static Sprite[] headIconPrayerSprites; @ObfuscatedName("ju") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("dragInventoryWidget") static Widget dragInventoryWidget; @@ -192,7 +192,7 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedName("fz") @ObfuscatedSignature( - signature = "(IIIIB)V", + descriptor = "(IIIIB)V", garbageValue = "98" ) @Export("drawEntities") @@ -653,12 +653,12 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedName("ki") @ObfuscatedSignature( - signature = "(Lhd;I)I", + descriptor = "(Lhd;I)I", garbageValue = "-1756984804" ) - @Export("getWidgetClickMask") - static int getWidgetClickMask(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.clickMask; + @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; } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 6459f78394..f9d8dac8f4 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class KitDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; @@ -27,7 +27,7 @@ public class KitDefinition extends DualNode { public static int KitDefinition_fileCount; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("KitDefinition_cached") static EvictingDualNodeHashTable KitDefinition_cached; @@ -74,7 +74,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "856121726" ) @Export("decode") @@ -91,7 +91,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;IB)V", + descriptor = "(Lkn;IB)V", garbageValue = "-72" ) @Export("decodeNext") @@ -137,7 +137,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1376663595" ) @Export("ready") @@ -159,7 +159,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lek;", + descriptor = "(I)Lek;", garbageValue = "-730489630" ) @Export("getModelData") @@ -199,7 +199,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1413999109" ) public boolean method4636() { @@ -216,7 +216,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Lek;", + descriptor = "(B)Lek;", garbageValue = "-127" ) @Export("getKitDefinitionModels") @@ -249,7 +249,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Ljo;", + descriptor = "(II)Ljo;", garbageValue = "1649830223" ) @Export("ItemDefinition_get") @@ -310,7 +310,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(CB)C", + descriptor = "(CB)C", garbageValue = "0" ) static char method4650(char var0) { @@ -389,7 +389,7 @@ public class KitDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1137606481" ) public static void method4624() { diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 333012d4ca..fed715c5d2 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -10,49 +10,49 @@ import net.runelite.mapping.ObfuscatedSignature; public class Language implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_EN") public static final Language Language_EN; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_DE") static final Language Language_DE; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_FR") public static final Language Language_FR; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_PT") static final Language Language_PT; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_NL") static final Language Language_NL; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_ES") public static final Language Language_ES; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lgz;" + descriptor = "[Lgz;" ) @Export("Language_valuesOrdered") static final Language[] Language_valuesOrdered; @@ -92,7 +92,7 @@ public class Language implements Enumerated { } @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lge;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lge;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { this.field2396 = var1; @@ -108,7 +108,7 @@ public class Language implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -118,7 +118,7 @@ public class Language implements Enumerated { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", + descriptor = "(B)Ljava/lang/String;", garbageValue = "-15" ) @Export("getLanguage") @@ -132,7 +132,7 @@ public class Language implements Enumerated { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Llf;III)I", + descriptor = "(Llf;III)I", garbageValue = "924911925" ) static int method3801(IterableNodeHashTable var0, int var1, int var2) { @@ -146,7 +146,7 @@ public class Language implements Enumerated { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Lgz;", + descriptor = "(I)[Lgz;", garbageValue = "1898345943" ) static Language[] method3783() { @@ -155,7 +155,7 @@ public class Language implements Enumerated { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)Lbr;", + descriptor = "(IB)Lbr;", garbageValue = "-87" ) @Export("Messages_getMessage") @@ -165,7 +165,7 @@ public class Language implements Enumerated { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IB)Lgz;", + descriptor = "(IB)Lgz;", garbageValue = "-67" ) @Export("Language_get") @@ -181,7 +181,7 @@ public class Language implements Enumerated { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lko;Lko;I)V", + descriptor = "(Lko;Lko;I)V", garbageValue = "916076858" ) static void method3786(Font var0, Font var1) { @@ -429,7 +429,7 @@ public class Language implements Enumerated { @ObfuscatedName("gj") @ObfuscatedSignature( - signature = "(IIII)I", + descriptor = "(IIII)I", garbageValue = "179125696" ) @Export("getTileHeight") @@ -454,7 +454,7 @@ public class Language implements Enumerated { @ObfuscatedName("jg") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1826045916" ) @Export("runIntfCloseListeners") diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 9cd542bddd..bf655d36ed 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class Link { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgd;" + descriptor = "Lgd;" ) @Export("previous") public Link previous; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgd;" + descriptor = "Lgd;" ) @Export("next") public Link next; diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index a4e55df494..56b284714a 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class LinkDeque { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgd;" + descriptor = "Lgd;" ) @Export("sentinel") Link sentinel; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgd;" + descriptor = "Lgd;" ) @Export("current") Link current; @@ -27,7 +27,7 @@ public class LinkDeque { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgd;)V" + descriptor = "(Lgd;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -43,7 +43,7 @@ public class LinkDeque { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Lgd;" + descriptor = "()Lgd;" ) @Export("last") public Link last() { @@ -59,7 +59,7 @@ public class LinkDeque { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lgd;" + descriptor = "()Lgd;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 7183c0cc4a..1295833d13 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -16,31 +16,31 @@ public class Login { static int xPadding; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("leftTitleSprite") static Sprite leftTitleSprite; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("logoSprite") static IndexedSprite logoSprite; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("options_buttons_0Sprite") static IndexedSprite options_buttons_0Sprite; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lcw;" + descriptor = "Lcw;" ) @Export("loginScreenRunesAnimation") static LoginScreenAnimation loginScreenRunesAnimation; @@ -173,7 +173,7 @@ public class Login { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIILga;Lfz;Z[I[IB)I", + descriptor = "(IIILga;Lfz;Z[I[IB)I", garbageValue = "0" ) public static int method2235(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { @@ -290,7 +290,7 @@ public class Login { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IILga;Lfz;I)Z", + descriptor = "(IILga;Lfz;I)Z", garbageValue = "783701635" ) static final boolean method2234(int var0, int var1, RouteStrategy var2, CollisionMap var3) { diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index d137e0171b..844337a44c 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -9,37 +9,37 @@ import net.runelite.mapping.ObfuscatedSignature; public class LoginPacket implements class190 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgx;" + descriptor = "Lgx;" ) public static final LoginPacket field2352; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgx;" + descriptor = "Lgx;" ) static final LoginPacket field2350; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgx;" + descriptor = "Lgx;" ) public static final LoginPacket field2347; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgx;" + descriptor = "Lgx;" ) public static final LoginPacket field2348; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgx;" + descriptor = "Lgx;" ) public static final LoginPacket field2345; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgx;" + descriptor = "Lgx;" ) static final LoginPacket field2346; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lgx;" + descriptor = "[Lgx;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; @@ -67,7 +67,7 @@ public class LoginPacket implements class190 { } @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { @@ -76,7 +76,7 @@ public class LoginPacket implements class190 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lik;", + descriptor = "(II)Lik;", garbageValue = "-729077438" ) public static HealthBarDefinition method3745(int var0) { diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 1f6a8ffff9..607f755499 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -16,7 +16,7 @@ public class LoginScreenAnimation { static int selectedItemSlot; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("sprites") IndexedSprite[] sprites; @@ -70,7 +70,7 @@ public class LoginScreenAnimation { int field1074; @ObfuscatedSignature( - signature = "([Llh;)V" + descriptor = "([Llh;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { this.field1075 = new int[256]; @@ -86,7 +86,7 @@ public class LoginScreenAnimation { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-16" ) @Export("initColors") @@ -157,7 +157,7 @@ public class LoginScreenAnimation { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2116735890" ) void method1878() { @@ -175,7 +175,7 @@ public class LoginScreenAnimation { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1329214185" ) @Export("draw") @@ -203,7 +203,7 @@ public class LoginScreenAnimation { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-305399146" ) final void method1880(int var1) { @@ -337,7 +337,7 @@ public class LoginScreenAnimation { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIII)I", + descriptor = "(IIII)I", garbageValue = "353428721" ) final int method1891(int var1, int var2, int var3) { @@ -347,7 +347,7 @@ public class LoginScreenAnimation { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "40685678" ) final void method1882(int var1) { @@ -367,7 +367,7 @@ public class LoginScreenAnimation { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I[IB)V", + descriptor = "(I[IB)V", garbageValue = "41" ) final void method1886(int var1, int[] var2) { @@ -387,7 +387,7 @@ public class LoginScreenAnimation { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "15252473" ) final void method1884(int var1) { @@ -431,7 +431,7 @@ public class LoginScreenAnimation { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Llh;I)V", + descriptor = "(Llh;I)V", garbageValue = "-760749522" ) final void method1885(IndexedSprite var1) { @@ -480,7 +480,7 @@ public class LoginScreenAnimation { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([BIIIIIII[Lfz;I)V", + descriptor = "([BIIIIIII[Lfz;I)V", garbageValue = "66216788" ) static final void method1879(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { @@ -527,7 +527,7 @@ public class LoginScreenAnimation { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-83" ) static void method1908(int var0) { @@ -539,7 +539,7 @@ public class LoginScreenAnimation { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-49" ) static void method1906() { @@ -551,7 +551,7 @@ public class LoginScreenAnimation { @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-1332294124" ) static int method1883(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 27247dcd18..f316c2f340 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -9,48 +9,48 @@ import net.runelite.mapping.ObfuscatedSignature; public class LoginType { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) @Export("oldscape") public static final LoginType oldscape; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4052; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4056; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4054; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4058; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4055; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4053; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) static final LoginType field4061; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) public static final LoginType field4059; @ObfuscatedName("z") @@ -79,7 +79,7 @@ public class LoginType { } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmo;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmo;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { this.field4060 = var1; diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 4a2fc8c2bd..869518cc20 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -40,7 +40,7 @@ public class MenuAction { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BZI)Ljava/lang/Object;", + descriptor = "([BZI)Ljava/lang/Object;", garbageValue = "1257898423" ) public static Object method2169(byte[] var0, boolean var1) { @@ -57,7 +57,7 @@ public class MenuAction { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Lic;I)V", + descriptor = "(Lic;Lic;I)V", garbageValue = "1591696142" ) public static void method2171(AbstractArchive var0, AbstractArchive var1) { @@ -67,7 +67,7 @@ public class MenuAction { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILic;IIIZI)V", + descriptor = "(ILic;IIIZI)V", garbageValue = "896837453" ) @Export("playMusicTrack") diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 0d463e16f0..29465f5d34 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class Message extends DualNode { @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive1") static Archive archive1; @ObfuscatedName("dy") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive12") static Archive archive12; @@ -42,19 +42,19 @@ public class Message extends DualNode { String sender; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lkq;" + descriptor = "Lkq;" ) @Export("senderUsername") Username senderUsername; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("isFromFriend0") TriBool isFromFriend0; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; @@ -73,7 +73,7 @@ public class Message extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "-427651151" ) @Export("set") @@ -92,7 +92,7 @@ public class Message extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2093900647" ) @Export("clearIsFromFriend") @@ -102,7 +102,7 @@ public class Message extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1408976904" ) @Export("isFromFriend") @@ -116,7 +116,7 @@ public class Message extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "511529108" ) @Export("fillIsFromFriend") @@ -126,7 +126,7 @@ public class Message extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "108" ) @Export("clearIsFromIgnored") @@ -136,7 +136,7 @@ public class Message extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "-124" ) @Export("isFromIgnored") @@ -150,7 +150,7 @@ public class Message extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-558597226" ) @Export("fillIsFromIgnored") @@ -160,7 +160,7 @@ public class Message extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1793288574" ) @Export("fillSenderUsername") @@ -175,130 +175,131 @@ public class Message extends DualNode { @ObfuscatedName("ik") @ObfuscatedSignature( - signature = "(Lhd;III)V", + descriptor = "(Lhd;III)V", garbageValue = "-1019531565" ) - static final void method1283(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget widget, int var1, int var2) { + if (widget.buttonType == 1) { + ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 24, 0, 0, widget.id); } String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = WorldMapAreaData.method762(var0); + if (widget.buttonType == 2 && !Client.isSpellSelected) { + var3 = WorldMapAreaData.Widget_getSpellActionName(widget); if (var3 != null) { - ScriptEvent.insertMenuItemNoShift(var3, ItemContainer.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + ScriptEvent.insertMenuItemNoShift(var3, ItemContainer.colorStartTag(65280) + widget.spellName, 25, 0, -1, widget.id); } } - if (var0.buttonType == 3) { - ScriptEvent.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + if (widget.buttonType == 3) { + ScriptEvent.insertMenuItemNoShift("Close", "", 26, 0, 0, widget.id); } - if (var0.buttonType == 4) { - ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + if (widget.buttonType == 4) { + ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 28, 0, 0, widget.id); } - if (var0.buttonType == 5) { - ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + if (widget.buttonType == 5) { + ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 29, 0, 0, widget.id); } - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + if (widget.buttonType == 6 && Client.meslayerContinueWidget == null) { + ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 30, 0, -1, widget.id); } int var4; int var6; int var7; int var13; - if (var0.type == 2) { + if (widget.type == 2) { var13 = 0; - for (var4 = 0; var4 < var0.height; ++var4) { - for (int var5 = 0; var5 < var0.width; ++var5) { - var6 = (var0.paddingX + 32) * var5; - var7 = (var0.paddingY + 32) * var4; + for (var4 = 0; var4 < widget.height; ++var4) { + for (int var5 = 0; var5 < widget.width; ++var5) { + var6 = (widget.paddingX + 32) * var5; + var7 = (widget.paddingY + 32) * var4; if (var13 < 20) { - var6 += var0.inventoryXOffsets[var13]; - var7 += var0.inventoryYOffsets[var13]; + var6 += widget.inventoryXOffsets[var13]; + var7 += widget.inventoryYOffsets[var13]; } if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { Client.dragItemSlotDestination = var13; - TaskHandler.field2066 = var0; - if (var0.itemIds[var13] > 0) { - ItemDefinition var8 = KitDefinition.ItemDefinition_get(var0.itemIds[var13] - 1); - if (Client.isItemSelected == 1 && FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { - if (var0.id != AbstractUserComparator.selectedItemWidget || var13 != LoginScreenAnimation.selectedItemSlot) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); + TaskHandler.hoveredItemContainer = widget; + if (widget.itemIds[var13] > 0) { + ItemDefinition itemDef = KitDefinition.ItemDefinition_get(widget.itemIds[var13] - 1); + if (Client.isItemSelected == 1 && FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { + if (widget.id != AbstractUserComparator.selectedItemWidget || var13 != LoginScreenAnimation.selectedItemSlot) { + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + itemDef.name, 31, itemDef.id, var13, widget.id); } - } else if (Client.isSpellSelected && FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { + } else if (Client.isSpellSelected && FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { if ((WorldMapSprite.selectedSpellFlags & 16) == 16) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + itemDef.name, 32, itemDef.id, var13, widget.id); } } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - if (Client.shiftClickDrop && ModelData0.method3375()) { - var10 = var8.getShiftClickIndex(); + String[] actionsAry = itemDef.inventoryActions; + int shiftClickIdx = -1; + if (Client.shiftClickDrop && ModelData0.shouldPrioritizeDrop()) { + shiftClickIdx = itemDef.getShiftClickIndex(); } - int var11; - if (FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { - for (var11 = 4; var11 >= 3; --var11) { - if (var11 != var10) { - WallDecoration.addWidgetItemMenuItem(var0, var8, var13, var11, false); + int loopIdx; + if (FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { + for (loopIdx = 4; loopIdx >= 3; --loopIdx) { + if (loopIdx != shiftClickIdx) { + WallDecoration.addWidgetItemMenuItem(widget, itemDef, var13, loopIdx, false); } } } - if (class198.method3774(KeyHandler.getWidgetClickMask(var0))) { - ScriptEvent.insertMenuItemNoShift("Use", ItemContainer.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); + if (class198.Widget_containerHasUseOption(KeyHandler.getWidgetFlags(widget))) { + ScriptEvent.insertMenuItemNoShift("Use", ItemContainer.colorStartTag(16748608) + itemDef.name, 38, itemDef.id, var13, widget.id); } - if (FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { - for (var11 = 2; var11 >= 0; --var11) { - if (var11 != var10) { - WallDecoration.addWidgetItemMenuItem(var0, var8, var13, var11, false); + if (FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { + for (loopIdx = 2; loopIdx >= 0; --loopIdx) { + if (loopIdx != shiftClickIdx) { + WallDecoration.addWidgetItemMenuItem(widget, itemDef, var13, loopIdx, false); } } - if (var10 >= 0) { - WallDecoration.addWidgetItemMenuItem(var0, var8, var13, var10, true); + if (shiftClickIdx >= 0) { + WallDecoration.addWidgetItemMenuItem(widget, itemDef, var13, shiftClickIdx, true); } } - var9 = var0.itemActions; - if (var9 != null) { - for (var11 = 4; var11 >= 0; --var11) { - if (var9[var11] != null) { - byte var12 = 0; - if (var11 == 0) { - var12 = 39; + actionsAry = widget.itemActions; + if (actionsAry != null) { + for (loopIdx = 4; loopIdx >= 0; --loopIdx) { + if (actionsAry[loopIdx] != null) { + byte opcode = 0; + if (loopIdx == 0) { + opcode = 39; } - if (var11 == 1) { - var12 = 40; + if (loopIdx == 1) { + opcode = 40; } - if (var11 == 2) { - var12 = 41; + if (loopIdx == 2) { + opcode = 41; } - if (var11 == 3) { - var12 = 42; + if (loopIdx == 3) { + opcode = 42; } - if (var11 == 4) { - var12 = 43; + if (loopIdx == 4) { + opcode = 43; } - ScriptEvent.insertMenuItemNoShift(var9[var11], ItemContainer.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); + ScriptEvent.insertMenuItemNoShift(actionsAry[loopIdx], ItemContainer.colorStartTag(16748608) + itemDef.name, opcode, itemDef.id, var13, widget.id); } } } - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + itemDef.name, 1005, itemDef.id, var13, widget.id); } } } @@ -308,55 +309,55 @@ public class Message extends DualNode { } } - if (var0.isIf3) { + if (widget.isIf3) { if (Client.isSpellSelected) { - var4 = KeyHandler.getWidgetClickMask(var0); + var4 = KeyHandler.getWidgetFlags(widget); boolean var19 = (var4 >> 21 & 1) != 0; if (var19 && (WorldMapSprite.selectedSpellFlags & 32) == 32) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + widget.dataText, 58, 0, widget.childIndex, widget.id); } } else { for (var13 = 9; var13 >= 5; --var13) { - var6 = KeyHandler.getWidgetClickMask(var0); + var6 = KeyHandler.getWidgetFlags(widget); boolean var17 = (var6 >> var13 + 1 & 1) != 0; String var14; - if (!var17 && var0.onOp == null) { + if (!var17 && widget.onOp == null) { var14 = null; - } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { - var14 = var0.actions[var13]; + } else if (widget.actions != null && widget.actions.length > var13 && widget.actions[var13] != null && widget.actions[var13].trim().length() != 0) { + var14 = widget.actions[var13]; } else { var14 = null; } if (var14 != null) { - ScriptEvent.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + ScriptEvent.insertMenuItemNoShift(var14, widget.dataText, 1007, var13 + 1, widget.childIndex, widget.id); } } - var3 = WorldMapAreaData.method762(var0); + var3 = WorldMapAreaData.Widget_getSpellActionName(widget); if (var3 != null) { - ScriptEvent.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + ScriptEvent.insertMenuItemNoShift(var3, widget.dataText, 25, 0, widget.childIndex, widget.id); } for (var4 = 4; var4 >= 0; --var4) { - var7 = KeyHandler.getWidgetClickMask(var0); + var7 = KeyHandler.getWidgetFlags(widget); boolean var18 = (var7 >> var4 + 1 & 1) != 0; String var15; - if (!var18 && var0.onOp == null) { + if (!var18 && widget.onOp == null) { var15 = null; - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { - var15 = var0.actions[var4]; + } else if (widget.actions != null && widget.actions.length > var4 && widget.actions[var4] != null && widget.actions[var4].trim().length() != 0) { + var15 = widget.actions[var4]; } else { var15 = null; } if (var15 != null) { - ApproximateRouteStrategy.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2744); + ApproximateRouteStrategy.insertMenuItem(var15, widget.dataText, 57, var4 + 1, widget.childIndex, widget.id, widget.prioritizeMenuEntry); } } - if (WorldMapLabel.method487(KeyHandler.getWidgetClickMask(var0))) { - ScriptEvent.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + if (WorldMapLabel.Widget_hasContinueOption(KeyHandler.getWidgetFlags(widget))) { + ScriptEvent.insertMenuItemNoShift("Continue", "", 30, 0, widget.childIndex, widget.id); } } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 17702e6329..ff64939d86 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -14,13 +14,13 @@ public class Messages { static final Map Messages_channels; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ljq;" + descriptor = "Ljq;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; @@ -45,7 +45,7 @@ public class Messages { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-1486803630" ) static final int method2350(int var0, int var1) { diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 36fa9296cd..2ed56a2112 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -10,7 +10,7 @@ public class MidiFileReader { static final byte[] field2509; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) @Export("buffer") Buffer buffer; diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index b431408449..22fd88de07 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class MidiPcmStream extends PcmStream { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("musicPatches") NodeHashTable musicPatches; @@ -55,17 +55,17 @@ public class MidiPcmStream extends PcmStream { int[] field2454; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[[Lhm;" + descriptor = "[[Lhm;" ) MusicPatchNode[][] field2466; @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "[[Lhm;" + descriptor = "[[Lhm;" ) MusicPatchNode[][] field2467; @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Lhl;" + descriptor = "Lhl;" ) @Export("midiFile") MidiFileReader midiFile; @@ -95,7 +95,7 @@ public class MidiPcmStream extends PcmStream { long field2473; @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Lhj;" + descriptor = "Lhj;" ) @Export("patchStream") MusicPatchPcmStream patchStream; @@ -128,7 +128,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1244273754" ) @Export("setPcmStreamVolume") @@ -138,7 +138,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-988270526" ) public int method3837() { @@ -147,7 +147,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lhz;Lic;Ldo;II)Z", + descriptor = "(Lhz;Lic;Ldo;II)Z", garbageValue = "-700249158" ) @Export("loadMusicTrack") @@ -186,7 +186,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "1" ) @Export("clearAll") @@ -199,7 +199,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-100699849" ) @Export("removeAll") @@ -212,7 +212,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { @@ -221,7 +221,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { @@ -260,7 +260,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lhz;ZI)V", + descriptor = "(Lhz;ZI)V", garbageValue = "746467478" ) @Export("setMusicTrack") @@ -308,7 +308,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "106" ) @Export("clear") @@ -319,7 +319,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1676507703" ) @Export("isReady") @@ -329,7 +329,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "0" ) public synchronized void method3935(int var1, int var2) { @@ -338,7 +338,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1377126651" ) void method3916(int var1, int var2) { @@ -349,7 +349,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "4" ) void method3846(int var1, int var2) { @@ -365,7 +365,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIS)V", + descriptor = "(IIIS)V", garbageValue = "23534" ) void method3847(int var1, int var2, int var3) { @@ -433,7 +433,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lhm;ZI)V", + descriptor = "(Lhm;ZI)V", garbageValue = "2083616471" ) void method3852(MusicPatchNode var1, boolean var2) { @@ -456,7 +456,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIIB)V", + descriptor = "(IIIB)V", garbageValue = "96" ) void method3849(int var1, int var2, int var3) { @@ -479,7 +479,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIB)V", + descriptor = "(IIIB)V", garbageValue = "1" ) void method3850(int var1, int var2, int var3) { @@ -487,7 +487,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "-70" ) void method3851(int var1, int var2) { @@ -495,7 +495,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "40" ) void method3961(int var1, int var2) { @@ -504,7 +504,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1783640245" ) void method3858(int var1) { @@ -531,7 +531,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "183029579" ) void method3952(int var1) { @@ -559,7 +559,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "911673263" ) void method3855(int var1) { @@ -574,7 +574,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-57" ) void method3856() { @@ -594,7 +594,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "8" ) void method3857(int var1) { @@ -610,7 +610,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1839659310" ) void method3929(int var1) { @@ -626,7 +626,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1915531597" ) void method3845(int var1) { @@ -820,7 +820,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1375281235" ) void method3860(int var1, int var2) { @@ -830,7 +830,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(Lhm;I)I", + descriptor = "(Lhm;I)I", garbageValue = "2062902962" ) int method3861(MusicPatchNode var1) { @@ -856,7 +856,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Lhm;I)I", + descriptor = "(Lhm;I)I", garbageValue = "-352128958" ) int method3958(MusicPatchNode var1) { @@ -902,7 +902,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lhm;B)I", + descriptor = "(Lhm;B)I", garbageValue = "0" ) int method3912(MusicPatchNode var1) { @@ -912,7 +912,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-668815738" ) void method3872() { @@ -958,7 +958,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Lhm;I)Z", + descriptor = "(Lhm;I)Z", garbageValue = "-1517604835" ) boolean method3870(MusicPatchNode var1) { @@ -978,7 +978,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Lhm;[IIII)Z", + descriptor = "(Lhm;[IIII)Z", garbageValue = "2001156959" ) boolean method3897(MusicPatchNode var1, int[] var2, int var3, int var4) { @@ -1078,7 +1078,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2049415960" ) public static void method3918() { @@ -1119,7 +1119,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1122474734" ) protected static final void method3905() { @@ -1139,7 +1139,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("fr") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "1626393180" ) @Export("forceDisconnect") diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 6ac14025f1..851b6330a8 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -15,7 +15,7 @@ public class MilliClock extends Clock { public static int musicTrackFileId; @ObfuscatedName("ds") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive0") static Archive archive0; @@ -67,7 +67,7 @@ public class MilliClock extends Clock { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1017447827" ) @Export("mark") @@ -80,7 +80,7 @@ public class MilliClock extends Clock { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-1786752641" ) @Export("wait") @@ -145,7 +145,7 @@ public class MilliClock extends Clock { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)J", + descriptor = "(I)J", garbageValue = "301883572" ) @Export("currentTimeMillis") @@ -161,7 +161,7 @@ public class MilliClock extends Clock { @ObfuscatedName("jh") @ObfuscatedSignature( - signature = "(Lhd;S)Z", + descriptor = "(Lhd;S)Z", garbageValue = "442" ) static final boolean method3586(Widget var0) { diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 907c477a44..16101d4521 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -11,73 +11,73 @@ import net.runelite.mapping.ObfuscatedSignature; public enum ModeWhere implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2412("", 0, new class200[]{class200.field2399}), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2414("", 1, new class200[]{class200.field2398, class200.field2399}), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2404("", 2, new class200[]{class200.field2398, class200.field2400, class200.field2399}), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2405("", 3, new class200[]{class200.field2398}), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2403("", 4), @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2406("", 5, new class200[]{class200.field2398, class200.field2399}), @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2408("", 6, new class200[]{class200.field2399}), @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2409("", 8, new class200[]{class200.field2398, class200.field2399}), @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2402("", 9, new class200[]{class200.field2398, class200.field2400}), @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2411("", 10, new class200[]{class200.field2398}), @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2410("", 11, new class200[]{class200.field2398}), @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2413("", 12, new class200[]{class200.field2398, class200.field2399}), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lge;" + descriptor = "Lge;" ) field2418("", 13, new class200[]{class200.field2398}); @ObfuscatedName("sw") @ObfuscatedSignature( - signature = "Lcg;" + descriptor = "Lcg;" ) @Export("friendSystem") public static FriendSystem friendSystem; @@ -91,7 +91,7 @@ public enum ModeWhere implements Enumerated { final Set field2416; @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgi;)V" + descriptor = "(Ljava/lang/String;I[Lgi;)V" ) ModeWhere(String var3, int var4, class200[] var5) { this.field2416 = new HashSet(); @@ -112,7 +112,7 @@ public enum ModeWhere implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -122,7 +122,7 @@ public enum ModeWhere implements Enumerated { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZZI)I", + descriptor = "(ZZI)I", garbageValue = "57776207" ) public static int method3809(boolean var0, boolean var1) { @@ -133,7 +133,7 @@ public enum ModeWhere implements Enumerated { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(CB)Z", + descriptor = "(CB)Z", garbageValue = "51" ) static boolean method3810(char var0) { diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index eb6d203951..78a709ff9c 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Model extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lef;" + descriptor = "Lef;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; @@ -17,7 +17,7 @@ public class Model extends Entity { static byte[] Model_sharedSequenceModelFaceAlphas; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lef;" + descriptor = "Lef;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; @@ -222,7 +222,7 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Lef;I)V" + descriptor = "([Lef;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; @@ -365,7 +365,7 @@ public class Model extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([[IIIIZI)Lef;" + descriptor = "([[IIIIZI)Lef;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -463,7 +463,7 @@ public class Model extends Entity { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Z)Lef;" + descriptor = "(Z)Lef;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -476,7 +476,7 @@ public class Model extends Entity { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Z)Lef;" + descriptor = "(Z)Lef;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -489,7 +489,7 @@ public class Model extends Entity { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZLef;[B)Lef;" + descriptor = "(ZLef;[B)Lef;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { @@ -678,7 +678,7 @@ public class Model extends Entity { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Leg;I)V" + descriptor = "(Leg;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -702,7 +702,7 @@ public class Model extends Entity { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Leg;ILeg;I[I)V" + descriptor = "(Leg;ILeg;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -1162,30 +1162,30 @@ public class Model extends Entity { var16 = modelViewportYs[var27]; var17 = modelViewportYs[var10]; var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean var32; + boolean isHovered; if (var18 < var15 && var18 < var16 && var18 < var17) { - var32 = false; + isHovered = false; } else { var18 = ViewportMouse.ViewportMouse_y - var6; if (var18 > var15 && var18 > var16 && var18 > var17) { - var32 = false; + isHovered = false; } else { var18 = var6 + ViewportMouse.ViewportMouse_x; if (var18 < var11 && var18 < var12 && var18 < var13) { - var32 = false; + isHovered = false; } else { var18 = ViewportMouse.ViewportMouse_x - var6; if (var18 > var11 && var18 > var12 && var18 > var13) { - var32 = false; + isHovered = false; } else { - var32 = true; + isHovered = true; } } } } - if (var32) { - ObjectSound.method2010(var4); + if (isHovered) { + ObjectSound.addEntityUnderMouse(var4); var2 = false; } } @@ -1674,7 +1674,7 @@ public class Model extends Entity { if (var34) { if (this.isSingleTile) { - ObjectSound.method2010(var9); + ObjectSound.addEntityUnderMouse(var9); } else { var33 = true; } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index c5a206112f..0c8ce2daff 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -92,19 +92,19 @@ public class ModelData extends Entity { int[][] faceLabelsAlpha; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Led;" + descriptor = "[Led;" ) @Export("faceNormals") FaceNormal[] faceNormals; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Let;" + descriptor = "[Let;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "[Let;" + descriptor = "[Let;" ) VertexNormal[] field1603; @ObfuscatedName("ai") @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Lek;I)V" + descriptor = "([Lek;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -309,7 +309,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "(Lek;ZZZZ)V", + descriptor = "(Lek;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -965,7 +965,7 @@ public class ModelData extends Entity { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lek;I)I" + descriptor = "(Lek;I)I" ) final int method2928(ModelData var1, int var2) { int var3 = -1; @@ -996,7 +996,7 @@ public class ModelData extends Entity { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lek;" + descriptor = "()Lek;" ) public ModelData method2938() { ModelData var1 = new ModelData(); @@ -1040,7 +1040,7 @@ public class ModelData extends Entity { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([[IIIIZI)Lek;" + descriptor = "([[IIIIZI)Lek;" ) public ModelData method2912(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); @@ -1437,7 +1437,7 @@ public class ModelData extends Entity { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IIIII)Lef;" + descriptor = "(IIIII)Lef;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -1624,7 +1624,7 @@ public class ModelData extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;II)Lek;" + descriptor = "(Lic;II)Lek;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1634,7 +1634,7 @@ public class ModelData extends Entity { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lek;Lek;IIIZ)V" + descriptor = "(Lek;Lek;IIIZ)V" ) static void method2924(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 4abbb5613b..b6c102dd02 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,7 +11,7 @@ public class ModelData0 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(CI)C", + descriptor = "(CI)C", garbageValue = "-706706502" ) static char method3374(char var0) { @@ -29,10 +30,11 @@ public class ModelData0 { @ObfuscatedName("ii") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1532544056" ) - static boolean method3375() { + @Export("shouldPrioritizeDrop") + static boolean shouldPrioritizeDrop() { return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index eb7d55be40..65485a4bca 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -14,7 +14,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lbc;" + descriptor = "Lbc;" ) @Export("MouseHandler_instance") public static MouseHandler MouseHandler_instance; @@ -153,7 +153,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/awt/event/MouseEvent;I)I", + descriptor = "(Ljava/awt/event/MouseEvent;I)I", garbageValue = "-750750909" ) @Export("getButton") @@ -243,7 +243,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-121589904" ) static void method1154() { diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 473d5df235..6f06b451ca 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -57,7 +57,7 @@ public class MouseRecorder implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(DDII)[D", + descriptor = "(DDII)[D", garbageValue = "-2077426308" ) public static double[] method1248(double var0, double var2, int var4) { @@ -78,7 +78,7 @@ public class MouseRecorder implements Runnable { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", + descriptor = "([BIII)Ljava/lang/String;", garbageValue = "-2086998807" ) @Export("decodeStringCp1252") @@ -107,7 +107,7 @@ public class MouseRecorder implements Runnable { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-150787474" ) public static void method1251() { @@ -116,7 +116,7 @@ public class MouseRecorder implements Runnable { @ObfuscatedName("fi") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1161280240" ) @Export("logOut") @@ -196,7 +196,7 @@ public class MouseRecorder implements Runnable { @ObfuscatedName("fy") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "-126" ) @Export("playSoundJingle") diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index f413873c09..270a1d4264 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface MouseWheel { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1995693829" ) @Export("useRotation") diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 330e6d23c5..b89c5a3a70 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -23,7 +23,7 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", + descriptor = "(Ljava/awt/Component;I)V", garbageValue = "-337398134" ) @Export("addTo") @@ -33,7 +33,7 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", + descriptor = "(Ljava/awt/Component;B)V", garbageValue = "21" ) @Export("removeFrom") @@ -43,7 +43,7 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1995693829" ) @Export("useRotation") diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index f94262d36b..c12b8e43fb 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -15,7 +15,7 @@ public class MusicPatch extends Node { int field2520; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Ldp;" + descriptor = "[Ldp;" ) @Export("rawSounds") RawSound[] rawSounds; @@ -27,7 +27,7 @@ public class MusicPatch extends Node { byte[] field2518; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[Lgp;" + descriptor = "[Lgp;" ) MusicPatchNode2[] field2519; @ObfuscatedName("n") @@ -481,7 +481,7 @@ public class MusicPatch extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ldo;[B[II)Z", + descriptor = "(Ldo;[B[II)Z", garbageValue = "512208018" ) boolean method4027(SoundCache var1, byte[] var2, int[] var3) { @@ -519,7 +519,7 @@ public class MusicPatch extends Node { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "58" ) @Export("clear") @@ -529,7 +529,7 @@ public class MusicPatch extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/io/File;I)V", + descriptor = "(Ljava/io/File;I)V", garbageValue = "-1151002932" ) static void method4025(File var0) { @@ -543,7 +543,7 @@ public class MusicPatch extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Llw;", + descriptor = "(I)[Llw;", garbageValue = "16711680" ) @Export("FillMode_values") diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 7e48861279..5462f6888f 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -18,19 +18,19 @@ public class MusicPatchNode extends Node { int field2479; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhi;" + descriptor = "Lhi;" ) @Export("patch") MusicPatch patch; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ldp;" + descriptor = "Ldp;" ) @Export("rawSound") RawSound rawSound; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgp;" + descriptor = "Lgp;" ) MusicPatchNode2 field2477; @ObfuscatedName("p") @@ -105,7 +105,7 @@ public class MusicPatchNode extends Node { int field2476; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldk;" + descriptor = "Ldk;" ) @Export("stream") RawPcmStream stream; @@ -125,7 +125,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "1" ) void method3963() { @@ -137,7 +137,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lig;II)V", + descriptor = "(Lig;II)V", garbageValue = "2117396915" ) static void method3968(Archive var0, int var1) { @@ -154,7 +154,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "2076016155" ) public static boolean method3966() { @@ -164,7 +164,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-6" ) static void method3970() { @@ -202,7 +202,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "158312448" ) static int method3964(int var0, Script var1, boolean var2) { @@ -232,7 +232,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-1086642561" ) static int method3969(int var0, Script var1, boolean var2) { @@ -254,7 +254,7 @@ public class MusicPatchNode extends Node { @ObfuscatedName("je") @ObfuscatedSignature( - signature = "(IIIIIIII)V", + descriptor = "(IIIIIIII)V", garbageValue = "-1185349902" ) @Export("updateRootInterface") diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 908b08139b..ed52f7620f 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class MusicPatchNode2 { @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "Lko;" + descriptor = "Lko;" ) @Export("fontPlain12") static Font fontPlain12; @@ -58,7 +58,7 @@ public class MusicPatchNode2 { @ObfuscatedName("ev") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "4" ) static int method3820() { @@ -77,7 +77,7 @@ public class MusicPatchNode2 { @ObfuscatedName("gs") @ObfuscatedSignature( - signature = "(Lbt;I)V", + descriptor = "(Lbt;I)V", garbageValue = "486554393" ) static final void method3819(PendingSpawn var0) { diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 3d745b0d5a..ce4b2a5ea4 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -12,25 +12,25 @@ public class MusicPatchPcmStream extends PcmStream { static GarbageCollectorMXBean garbageCollector; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgw;" + descriptor = "Lgw;" ) @Export("superStream") MidiPcmStream superStream; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("queue") NodeDeque queue; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ldd;" + descriptor = "Ldd;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lgw;)V" + descriptor = "(Lgw;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -40,7 +40,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lhm;[IIIIB)V", + descriptor = "(Lhm;[IIIIB)V", garbageValue = "7" ) void method4040(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { @@ -90,7 +90,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhm;II)V", + descriptor = "(Lhm;II)V", garbageValue = "948558076" ) void method4041(MusicPatchNode var1, int var2) { @@ -119,7 +119,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -133,7 +133,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -205,7 +205,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "-836395445" ) @Export("setLoginResponseString") diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index ca76630f3c..e5127f5b1a 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class MusicTrack extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("table") NodeHashTable table; @@ -17,7 +17,7 @@ public class MusicTrack extends Node { byte[] midi; @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; @@ -424,7 +424,7 @@ public class MusicTrack extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;II)Lhz;" + descriptor = "(Lic;II)Lhz;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index dfbb8c8fe5..684e0ab72c 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class NPC extends Actor { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("SpotAnimationDefinition_modelArchive") static AbstractArchive SpotAnimationDefinition_modelArchive; @@ -17,7 +17,7 @@ public final class NPC extends Actor { static int[] SpriteBuffer_yOffsets; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljz;" + descriptor = "Ljz;" ) @Export("definition") NPCDefinition definition; @@ -27,7 +27,7 @@ public final class NPC extends Actor { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IBI)V", + descriptor = "(IBI)V", garbageValue = "-676669615" ) final void method2150(int var1, byte var2) { @@ -90,7 +90,7 @@ public final class NPC extends Actor { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIZI)V", + descriptor = "(IIZI)V", garbageValue = "-1996954385" ) final void method2142(int var1, int var2, boolean var3) { @@ -130,7 +130,7 @@ public final class NPC extends Actor { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") @@ -166,7 +166,7 @@ public final class NPC extends Actor { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "1" ) @Export("isVisible") @@ -176,7 +176,7 @@ public final class NPC extends Actor { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)Ljava/lang/String;", + descriptor = "(Lkn;I)Ljava/lang/String;", garbageValue = "1758966720" ) public static String method2157(Buffer var0) { @@ -185,7 +185,7 @@ public final class NPC extends Actor { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(S)V", + descriptor = "(S)V", garbageValue = "-25347" ) static void method2156() { @@ -200,7 +200,7 @@ public final class NPC extends Actor { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ldh;I)V", + descriptor = "(Ldh;I)V", garbageValue = "2097901447" ) public static final void method2144(PlayerProvider var0) { diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index f9cfe9db5e..5f4d2086b5 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -10,25 +10,25 @@ import net.runelite.rs.ScriptOpcodes; public class NPCDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("NpcDefinition_cached") public static EvictingDualNodeHashTable NpcDefinition_cached; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("NpcDefinition_cachedModels") public static EvictingDualNodeHashTable NpcDefinition_cachedModels; @@ -183,7 +183,7 @@ public class NPCDefinition extends DualNode { public boolean isFollower; @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -222,7 +222,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-515379309" ) @Export("postDecode") @@ -231,7 +231,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1111522508" ) @Export("decode") @@ -248,7 +248,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-1876580246" ) @Export("decodeNext") @@ -373,7 +373,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljm;ILjm;II)Lef;", + descriptor = "(Ljm;ILjm;II)Lef;", garbageValue = "645123474" ) @Export("getModel") @@ -447,7 +447,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lek;", + descriptor = "(I)Lek;", garbageValue = "1862538614" ) @Export("getModelData") @@ -502,7 +502,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Ljz;", + descriptor = "(I)Ljz;", garbageValue = "478343419" ) @Export("transform") @@ -526,7 +526,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "1" ) @Export("transformIsVisible") @@ -551,7 +551,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIB)I", + descriptor = "(IIB)I", garbageValue = "-3" ) @Export("getIntParam") @@ -561,7 +561,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", garbageValue = "-1927040360" ) @Export("getStringParam") @@ -571,7 +571,7 @@ public class NPCDefinition extends DualNode { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1804514310" ) static int method4922(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index ff5da86994..ff9b680e9b 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -20,7 +20,7 @@ public class NanoClock extends Clock { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1017447827" ) @Export("mark") @@ -30,7 +30,7 @@ public class NanoClock extends Clock { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-1786752641" ) @Export("wait") diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 766ab8e363..8b3f8559e9 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -10,7 +10,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class NetCache { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llj;" + descriptor = "Llj;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; @@ -22,7 +22,7 @@ public class NetCache { public static int NetCache_loadTime; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; @@ -34,7 +34,7 @@ public class NetCache { public static int NetCache_pendingPriorityWritesCount; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; @@ -46,13 +46,13 @@ public class NetCache { public static int NetCache_pendingPriorityResponsesCount; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljd;" + descriptor = "Ljd;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("NetCache_pendingWrites") public static NodeHashTable NetCache_pendingWrites; @@ -64,7 +64,7 @@ public class NetCache { public static int NetCache_pendingWritesCount; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; @@ -78,7 +78,7 @@ public class NetCache { public static boolean field3208; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; @@ -92,7 +92,7 @@ public class NetCache { public static CRC32 NetCache_crc; @ObfuscatedName("l") @ObfuscatedSignature( - signature = "[Lig;" + descriptor = "[Lig;" ) @Export("NetCache_archives") public static Archive[] NetCache_archives; diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 35f76dfdb4..69990c3153 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class NetFileRequest extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive") public Archive archive; @@ -28,7 +28,7 @@ public class NetFileRequest extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "-612356648" ) static boolean method4304(char var0) { @@ -43,7 +43,7 @@ public class NetFileRequest extends DualNode { @ObfuscatedName("ij") @ObfuscatedSignature( - signature = "(IIIIIIIII)V", + descriptor = "(IIIIIIIII)V", garbageValue = "-1145163576" ) @Export("drawWidgets") diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 99216c23af..23c794cb52 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -14,7 +14,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("st") @ObfuscatedSignature( - signature = "Lcz;" + descriptor = "Lcz;" ) @Export("clientPreferences") static ClientPreferences clientPreferences; @@ -32,13 +32,13 @@ public final class NetSocket extends AbstractSocket implements Runnable { boolean isClosed; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lfm;" + descriptor = "Lfm;" ) @Export("taskHandler") TaskHandler taskHandler; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfa;" + descriptor = "Lfa;" ) @Export("task") Task task; @@ -74,7 +74,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lfm;I)V" + descriptor = "(Ljava/net/Socket;Lfm;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -95,7 +95,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-768493590" ) @Export("close") @@ -125,7 +125,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "-8" ) @Export("readUnsignedByte") @@ -135,7 +135,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1942767880" ) @Export("available") @@ -145,7 +145,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "1355091335" ) @Export("isAvailable") @@ -159,7 +159,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIIB)I", + descriptor = "([BIIB)I", garbageValue = "37" ) @Export("read") @@ -184,7 +184,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "-950578253" ) @Export("write0") @@ -219,7 +219,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIIB)V", + descriptor = "([BIIB)V", garbageValue = "-105" ) @Export("write") @@ -305,7 +305,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)Ljm;", + descriptor = "(IB)Ljm;", garbageValue = "67" ) @Export("SequenceDefinition_get") @@ -328,7 +328,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkn;J)V" + descriptor = "(Lkn;J)V" ) static void method3677(Buffer var0, long var1) { var1 /= 10L; @@ -343,7 +343,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(II)Leg;", + descriptor = "(II)Leg;", garbageValue = "-1650164099" ) @Export("getFrames") @@ -391,7 +391,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedName("ko") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2085444453" ) static void method3674() { diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 8ff5403d97..8d049737b9 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -11,13 +11,13 @@ public class Node { public long key; @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("previous") public Node previous; @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("next") public Node next; diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index f68f0df90d..38b78fcfaa 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class NodeDeque { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("sentinel") public Node sentinel; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("current") Node current; @@ -41,7 +41,7 @@ public class NodeDeque { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgr;)V" + descriptor = "(Lgr;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -57,7 +57,7 @@ public class NodeDeque { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lgr;)V" + descriptor = "(Lgr;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -73,7 +73,7 @@ public class NodeDeque { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("removeLast") public Node removeLast() { @@ -88,7 +88,7 @@ public class NodeDeque { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("removeFirst") public Node removeFirst() { @@ -103,7 +103,7 @@ public class NodeDeque { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("last") public Node last() { @@ -119,7 +119,7 @@ public class NodeDeque { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("first") public Node first() { @@ -135,7 +135,7 @@ public class NodeDeque { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("previous") public Node previous() { @@ -151,7 +151,7 @@ public class NodeDeque { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("next") public Node next() { @@ -167,7 +167,7 @@ public class NodeDeque { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lgr;Lgr;)V" + descriptor = "(Lgr;Lgr;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index b030e84860..4c302f3f2b 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -11,19 +11,19 @@ public final class NodeHashTable { int size; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lgr;" + descriptor = "[Lgr;" ) @Export("buckets") Node[] buckets; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("currentGet") Node currentGet; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgr;" + descriptor = "Lgr;" ) @Export("current") Node current; @@ -46,7 +46,7 @@ public final class NodeHashTable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(J)Lgr;" + descriptor = "(J)Lgr;" ) @Export("get") public Node get(long var1) { @@ -66,7 +66,7 @@ public final class NodeHashTable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lgr;J)V" + descriptor = "(Lgr;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -84,7 +84,7 @@ public final class NodeHashTable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("first") public Node first() { @@ -94,7 +94,7 @@ public final class NodeHashTable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lgr;" + descriptor = "()Lgr;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index f57a7ba3c2..a21080f21d 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -12,43 +12,43 @@ public class ObjectDefinition extends DualNode { public static boolean ObjectDefinition_isLowDetail; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ObjectDefinition_cached") public static EvictingDualNodeHashTable ObjectDefinition_cached; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ObjectDefinition_cachedEntities") public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ObjectDefinition_cachedModels") public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lek;" + descriptor = "[Lek;" ) static ModelData[] field3387; @ObfuscatedName("a") @@ -254,7 +254,7 @@ public class ObjectDefinition extends DualNode { public int[] soundEffectIds; @ObfuscatedName("au") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -306,7 +306,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2073183413" ) @Export("postDecode") @@ -332,7 +332,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1769897725" ) @Export("decode") @@ -349,7 +349,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1890862568" ) @Export("decodeNext") @@ -523,7 +523,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "-582355792" ) public final boolean method4786(int var1) { @@ -552,7 +552,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "285356335" ) @Export("needsModelFiles") @@ -572,7 +572,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II[[IIIIS)Lel;", + descriptor = "(II[[IIIIS)Lel;", garbageValue = "20314" ) @Export("getEntity") @@ -620,7 +620,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II[[IIIII)Lef;", + descriptor = "(II[[IIIII)Lef;", garbageValue = "-1099346237" ) @Export("getModel") @@ -652,7 +652,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II[[IIIILjm;II)Lef;", + descriptor = "(II[[IIIILjm;II)Lef;", garbageValue = "132862520" ) @Export("getModelDynamic") @@ -694,7 +694,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIB)Lek;", + descriptor = "(IIB)Lek;", garbageValue = "0" ) @Export("getModelData") @@ -835,7 +835,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)Ljg;", + descriptor = "(I)Ljg;", garbageValue = "-511896021" ) @Export("transform") @@ -859,7 +859,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "1846557749" ) @Export("getIntParam") @@ -869,7 +869,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", garbageValue = "494622179" ) @Export("getStringParam") @@ -879,7 +879,7 @@ public class ObjectDefinition extends DualNode { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "389489469" ) @Export("hasSound") diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index bb0b3fb623..0f1f13022f 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class ObjectSound extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("objectSounds") static NodeDeque objectSounds; @@ -60,7 +60,7 @@ public final class ObjectSound extends Node { int soundEffectId; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Ldk;" + descriptor = "Ldk;" ) @Export("stream1") RawPcmStream stream1; @@ -84,13 +84,13 @@ public final class ObjectSound extends Node { int field1111; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Ldk;" + descriptor = "Ldk;" ) @Export("stream2") RawPcmStream stream2; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljg;" + descriptor = "Ljg;" ) @Export("obj") ObjectDefinition obj; @@ -104,7 +104,7 @@ public final class ObjectSound extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2014471583" ) @Export("set") @@ -134,7 +134,7 @@ public final class ObjectSound extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", garbageValue = "-997797111" ) @Export("addGameMessage") @@ -144,7 +144,7 @@ public final class ObjectSound extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;I)V", + descriptor = "(Lic;I)V", garbageValue = "1163495687" ) public static void method1999(AbstractArchive var0) { @@ -153,7 +153,7 @@ public final class ObjectSound extends Node { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(S)V", + descriptor = "(S)V", garbageValue = "23035" ) public static void method2007() { @@ -161,13 +161,14 @@ public final class ObjectSound extends Node { } @ObfuscatedName("w") - static final void method2010(long var0) { + @Export("addEntityUnderMouse") + static final void addEntityUnderMouse(long var0) { ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; } @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1381107864" ) public static void method2008() { diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 0e9712aefe..7134b5a9e9 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -11,7 +11,7 @@ public class PacketBuffer extends Buffer { static final int[] field3728; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llb;" + descriptor = "Llb;" ) @Export("isaacCipher") IsaacCipher isaacCipher; @@ -32,7 +32,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([II)V", + descriptor = "([II)V", garbageValue = "-1865727993" ) @Export("newIsaacCipher") @@ -42,7 +42,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Llb;I)V", + descriptor = "(Llb;I)V", garbageValue = "-472683600" ) @Export("setIsaacCipher") @@ -52,7 +52,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-2126324259" ) @Export("writeByteIsaac") @@ -62,7 +62,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1443887320" ) @Export("readByteIsaac") @@ -72,7 +72,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1957045910" ) public boolean method5657() { @@ -82,7 +82,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "691786573" ) @Export("readSmartByteShortIsaac") @@ -93,7 +93,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIII)V", + descriptor = "([BIII)V", garbageValue = "1379772441" ) public void method5680(byte[] var1, int var2, int var3) { @@ -105,7 +105,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1358588268" ) @Export("importIndex") @@ -115,7 +115,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-1109143909" ) @Export("readBits") @@ -140,7 +140,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-15519430" ) @Export("exportIndex") @@ -150,7 +150,7 @@ public class PacketBuffer extends Buffer { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "565890213" ) @Export("bitsRemaining") diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 7613326daa..46fe62853e 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class PacketBufferNode extends Node { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lgj;" + descriptor = "[Lgj;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; @@ -21,7 +21,7 @@ public class PacketBufferNode extends Node { static int PacketBufferNode_packetBufferNodeCount; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgn;" + descriptor = "Lgn;" ) @Export("clientPacket") ClientPacket clientPacket; @@ -33,7 +33,7 @@ public class PacketBufferNode extends Node { int clientPacketLength; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkb;" + descriptor = "Lkb;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; @@ -54,7 +54,7 @@ public class PacketBufferNode extends Node { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-42" ) @Export("release") @@ -66,7 +66,7 @@ public class PacketBufferNode extends Node { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "1965042826" ) static final int method3750(int var0, int var1) { diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 316d68bd1c..5ca3526d16 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -10,13 +10,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class PacketWriter { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llj;" + descriptor = "Llj;" ) @Export("socket") AbstractSocket socket; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljx;" + descriptor = "Ljx;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; @@ -28,25 +28,25 @@ public class PacketWriter { int bufferSize; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) @Export("buffer") Buffer buffer; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llb;" + descriptor = "Llb;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkb;" + descriptor = "Lkb;" ) @Export("packetBuffer") PacketBuffer packetBuffer; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) @Export("serverPacket") ServerPacket serverPacket; @@ -71,17 +71,17 @@ public class PacketWriter { int pendingWrites; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) ServerPacket field1350; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) ServerPacket field1351; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) ServerPacket field1342; @@ -99,7 +99,7 @@ public class PacketWriter { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "65" ) @Export("clearBuffer") @@ -110,7 +110,7 @@ public class PacketWriter { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1917984042" ) @Export("flush") @@ -138,7 +138,7 @@ public class PacketWriter { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lgj;I)V", + descriptor = "(Lgj;I)V", garbageValue = "-251135286" ) @Export("addNode") @@ -151,7 +151,7 @@ public class PacketWriter { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Llj;I)V", + descriptor = "(Llj;I)V", garbageValue = "-1410560856" ) @Export("setSocket") @@ -161,7 +161,7 @@ public class PacketWriter { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "446694129" ) @Export("close") @@ -175,7 +175,7 @@ public class PacketWriter { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2011501008" ) @Export("removeSocket") @@ -185,7 +185,7 @@ public class PacketWriter { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Llj;", + descriptor = "(I)Llj;", garbageValue = "2137567404" ) @Export("getSocket") diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index e5714825de..e7f3d67d20 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class ParamDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("ParamDefinition_cached") public static EvictingDualNodeHashTable ParamDefinition_cached; @@ -42,7 +42,7 @@ public class ParamDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1718151512" ) @Export("postDecode") @@ -51,7 +51,7 @@ public class ParamDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-115197089" ) @Export("decode") @@ -68,7 +68,7 @@ public class ParamDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-1727060018" ) @Export("decodeNext") @@ -103,7 +103,7 @@ public class ParamDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "624673738" ) @Export("isString") diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 1569ba424e..64dd059916 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class PcmPlayer { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Ldg;" + descriptor = "Ldg;" ) @Export("soundSystem") static SoundSystem soundSystem; @@ -18,7 +18,7 @@ public class PcmPlayer { protected int[] samples; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ldf;" + descriptor = "Ldf;" ) @Export("stream") PcmStream stream; @@ -83,12 +83,12 @@ public class PcmPlayer { int field1448; @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "[Ldf;" + descriptor = "[Ldf;" ) PcmStream[] field1449; @ObfuscatedName("am") @ObfuscatedSignature( - signature = "[Ldf;" + descriptor = "[Ldf;" ) PcmStream[] field1453; @@ -108,7 +108,7 @@ public class PcmPlayer { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2128910021" ) @Export("init") @@ -117,7 +117,7 @@ public class PcmPlayer { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-14" ) @Export("open") @@ -126,7 +126,7 @@ public class PcmPlayer { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1868944096" ) @Export("position") @@ -141,7 +141,7 @@ public class PcmPlayer { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1900446281" ) @Export("close") @@ -150,7 +150,7 @@ public class PcmPlayer { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "630637593" ) @Export("discard") @@ -159,7 +159,7 @@ public class PcmPlayer { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ldf;I)V", + descriptor = "(Ldf;I)V", garbageValue = "204760061" ) @Export("setStream") @@ -169,7 +169,7 @@ public class PcmPlayer { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "277207832" ) @Export("run") @@ -262,7 +262,7 @@ public class PcmPlayer { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-537221049" ) public final void method2560() { @@ -271,7 +271,7 @@ public class PcmPlayer { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-209566182" ) @Export("tryDiscard") @@ -289,7 +289,7 @@ public class PcmPlayer { @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "733916097" ) @Export("shutdown") @@ -320,7 +320,7 @@ public class PcmPlayer { @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1841493566" ) @Export("skip") @@ -452,7 +452,7 @@ public class PcmPlayer { @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Ldf;IB)V", + descriptor = "(Ldf;IB)V", garbageValue = "45" ) final void method2565(PcmStream var1, int var2) { diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 7bd006ac64..3263413d3a 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -11,7 +11,7 @@ public abstract class PcmStream extends Node { volatile boolean active; @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldf;" + descriptor = "Ldf;" ) @Export("after") PcmStream after; @@ -19,7 +19,7 @@ public abstract class PcmStream extends Node { int field1520; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldy;" + descriptor = "Ldy;" ) @Export("sound") AbstractSound sound; @@ -30,14 +30,14 @@ public abstract class PcmStream extends Node { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 0fe68c1e1a..1c346300de 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class PcmStreamMixer extends PcmStream { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("subStreams") NodeDeque subStreams; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) NodeDeque field1373; @ObfuscatedName("q") @@ -31,7 +31,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldf;)V" + descriptor = "(Ldf;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { @@ -40,7 +40,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ldf;)V" + descriptor = "(Ldf;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { @@ -62,7 +62,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lgr;Ldb;)V" + descriptor = "(Lgr;Ldb;)V" ) void method2423(Node var1, PcmStreamMixerListener var2) { while (this.field1373.sentinel != var1 && ((PcmStreamMixerListener)var1).field1476 <= var2.field1476) { @@ -75,7 +75,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ldb;)V" + descriptor = "(Ldb;)V" ) void method2424(PcmStreamMixerListener var1) { var1.remove(); @@ -91,7 +91,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -100,7 +100,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 4a40cfc1c7..4b7fb30e90 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -15,7 +15,7 @@ public abstract class PcmStreamMixerListener extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ldd;)I" + descriptor = "(Ldd;)I" ) @Export("update") abstract int update(); diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 038a116176..1f0c11b37d 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -85,7 +85,7 @@ public final class PendingSpawn extends Node { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lic;Ljava/lang/String;Ljava/lang/String;I)[Llh;", + descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;I)[Llh;", garbageValue = "574747014" ) public static IndexedSprite[] method1806(AbstractArchive var0, String var1, String var2) { @@ -96,7 +96,7 @@ public final class PendingSpawn extends Node { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lhd;I[B[BI)V", + descriptor = "(Lhd;I[B[BI)V", garbageValue = "-1571904788" ) @Export("Widget_setKey") @@ -131,7 +131,7 @@ public final class PendingSpawn extends Node { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "556274205" ) static int method1808(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 9f5d128eda..1704e50a54 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -134,7 +134,7 @@ public class PlatformInfo extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "972520847" ) @Export("write") @@ -173,7 +173,7 @@ public class PlatformInfo extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1553987970" ) @Export("size") diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index a35bd31ded..6e5084bc58 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface PlatformInfoProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Lmc;", + descriptor = "(I)Lmc;", garbageValue = "-1826697521" ) @Export("get") diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 6cdb92a53a..9ffd42874f 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -14,13 +14,13 @@ public final class Player extends Actor { static int field638; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkq;" + descriptor = "Lkq;" ) @Export("username") Username username; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhv;" + descriptor = "Lhv;" ) @Export("appearance") PlayerAppearance appearance; @@ -87,7 +87,7 @@ public final class Player extends Actor { int field653; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lef;" + descriptor = "Lef;" ) @Export("model0") Model model0; @@ -137,13 +137,13 @@ public final class Player extends Actor { int index; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("isInClanChat") TriBool isInClanChat; @@ -185,7 +185,7 @@ public final class Player extends Actor { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "1937390555" ) @Export("read") @@ -291,7 +291,7 @@ public final class Player extends Actor { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-928055977" ) @Export("isFriend") @@ -305,7 +305,7 @@ public final class Player extends Actor { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1165782088" ) @Export("clearIsFriend") @@ -315,7 +315,7 @@ public final class Player extends Actor { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2131517341" ) @Export("checkIsFriend") @@ -325,7 +325,7 @@ public final class Player extends Actor { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1651593034" ) @Export("isClanMember") @@ -339,7 +339,7 @@ public final class Player extends Actor { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1245879584" ) @Export("clearIsInClanChat") @@ -349,7 +349,7 @@ public final class Player extends Actor { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "0" ) @Export("updateIsInClanChat") @@ -359,7 +359,7 @@ public final class Player extends Actor { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-6778929" ) @Export("transformedSize") @@ -369,7 +369,7 @@ public final class Player extends Actor { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") @@ -440,7 +440,7 @@ public final class Player extends Actor { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIBI)V", + descriptor = "(IIBI)V", garbageValue = "-1126022474" ) final void method1300(int var1, int var2, byte var3) { @@ -467,7 +467,7 @@ public final class Player extends Actor { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "2675490" ) @Export("resetPath") @@ -484,7 +484,7 @@ public final class Player extends Actor { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIBI)V", + descriptor = "(IIBI)V", garbageValue = "-1628655645" ) final void method1302(int var1, int var2, byte var3) { @@ -505,7 +505,7 @@ public final class Player extends Actor { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "1" ) @Export("isVisible") @@ -515,7 +515,7 @@ public final class Player extends Actor { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-2139314606" ) @Export("changeWorldSelectSorting") @@ -541,7 +541,7 @@ public final class Player extends Actor { @ObfuscatedName("io") @ObfuscatedSignature( - signature = "(Lby;IIIS)V", + descriptor = "(Lby;IIIS)V", garbageValue = "160" ) @Export("addPlayerToMenu") @@ -550,7 +550,7 @@ public final class Player extends Actor { if (Client.menuOptionsCount < 400) { String var4; if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + Canvas.method924(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + var4 = var0.actions[0] + var0.username + var0.actions[1] + Canvas.getColorForCombatDifference(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; } else { var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; } @@ -606,7 +606,7 @@ public final class Player extends Actor { @ObfuscatedName("iv") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "452106658" ) @Export("getTapToDrop") diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 5530948f0d..8e956c446c 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -18,7 +18,7 @@ public class PlayerAppearance { static final int[] equipmentIndices; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("PlayerAppearance_cachedModels") static EvictingDualNodeHashTable PlayerAppearance_cachedModels; @@ -56,7 +56,7 @@ public class PlayerAppearance { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([I[IZIB)V", + descriptor = "([I[IZIB)V", garbageValue = "28" ) @Export("update") @@ -84,7 +84,7 @@ public class PlayerAppearance { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IZI)V", + descriptor = "(IZI)V", garbageValue = "-311469480" ) @Export("changeAppearance") @@ -119,7 +119,7 @@ public class PlayerAppearance { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IZI)V", + descriptor = "(IZI)V", garbageValue = "1803508005" ) public void method4139(int var1, boolean var2) { @@ -146,7 +146,7 @@ public class PlayerAppearance { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZB)V", + descriptor = "(ZB)V", garbageValue = "80" ) @Export("changeSex") @@ -158,7 +158,7 @@ public class PlayerAppearance { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "1039310392" ) @Export("write") @@ -183,7 +183,7 @@ public class PlayerAppearance { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1504678480" ) @Export("setHash") @@ -228,7 +228,7 @@ public class PlayerAppearance { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljm;ILjm;IB)Lef;", + descriptor = "(Ljm;ILjm;IB)Lef;", garbageValue = "-39" ) @Export("getModel") @@ -342,7 +342,7 @@ public class PlayerAppearance { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Lek;", + descriptor = "(I)Lek;", garbageValue = "1279431909" ) @Export("getModelData") @@ -408,7 +408,7 @@ public class PlayerAppearance { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "0" ) @Export("getChatHeadId") @@ -418,11 +418,11 @@ public class PlayerAppearance { @ObfuscatedName("kf") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "1446127367" ) static void method4177(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.first(); var1 != null; var1 = (IntegerNode)Client.widgetClickMasks.next()) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { if ((long)var0 == (var1.key >> 48 & 65535L)) { var1.remove(); } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 226290676f..f435356210 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface PlayerProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ldt;", + descriptor = "(I)Ldt;", garbageValue = "-1371983171" ) @Export("player") diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 916dab660a..5dd88b5ca6 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -10,50 +10,50 @@ import net.runelite.rs.ScriptOpcodes; public enum PlayerType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lis;" + descriptor = "Lis;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lis;" + descriptor = "Lis;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lis;" + descriptor = "Lis;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lis;" + descriptor = "Lis;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lis;" + descriptor = "Lis;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lis;" + descriptor = "Lis;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Liq;" + descriptor = "Liq;" ) @Export("NetCache_currentResponse") public static NetFileRequest NetCache_currentResponse; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lij;" + descriptor = "Lij;" ) static GameBuild field3130; @ObfuscatedName("n") @@ -84,7 +84,7 @@ public enum PlayerType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -94,7 +94,7 @@ public enum PlayerType implements Enumerated { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1286217427" ) static int method4289(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 025c7f3310..060dba9838 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -13,7 +13,7 @@ public class Players { static byte[] field1278; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lkn;" + descriptor = "[Lkn;" ) static Buffer[] field1279; @ObfuscatedName("g") @@ -54,7 +54,7 @@ public class Players { static int[] Players_pendingUpdateIndices; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) static Buffer field1289; @@ -76,7 +76,7 @@ public class Players { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)I", + descriptor = "(IIII)I", garbageValue = "-1312297159" ) static int method2285(int var0, int var1, int var2) { @@ -102,7 +102,7 @@ public class Players { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "910052167" ) public static void method2274() { diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 5c84b97d60..321e176f45 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -8,17 +8,17 @@ import net.runelite.mapping.ObfuscatedSignature; public class PrivateChatMode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lls;" + descriptor = "Lls;" ) static final PrivateChatMode field3819; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lls;" + descriptor = "Lls;" ) public static final PrivateChatMode field3818; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lls;" + descriptor = "Lls;" ) static final PrivateChatMode field3820; @ObfuscatedName("j") diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 5e2493ae5c..b0bcb19182 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class Projectile extends Entity { @ObfuscatedName("dk") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive7") static Archive archive7; @@ -120,7 +120,7 @@ public final class Projectile extends Entity { int pitch; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljm;" + descriptor = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @@ -164,7 +164,7 @@ public final class Projectile extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "129892196" ) @Export("setDestination") @@ -192,7 +192,7 @@ public final class Projectile extends Entity { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "-44" ) @Export("advance") @@ -228,7 +228,7 @@ public final class Projectile extends Entity { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") @@ -245,7 +245,7 @@ public final class Projectile extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-40295508" ) static void method2247() { @@ -259,7 +259,7 @@ public final class Projectile extends Entity { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "3" ) public static boolean method2249(int var0) { diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 1ad2129198..7fae546ac3 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -38,7 +38,7 @@ public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", + descriptor = "(Ljava/awt/Component;B)V", garbageValue = "-55" ) @Export("setComponent") @@ -48,7 +48,7 @@ public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIB)V", + descriptor = "(IIB)V", garbageValue = "-5" ) @Export("drawFull") @@ -58,7 +58,7 @@ public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "-1334771637" ) @Export("draw") @@ -68,7 +68,7 @@ public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/awt/Graphics;III)V", + descriptor = "(Ljava/awt/Graphics;III)V", garbageValue = "2097062254" ) @Export("drawFull0") @@ -83,7 +83,7 @@ public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/awt/Graphics;IIIII)V", + descriptor = "(Ljava/awt/Graphics;IIIII)V", garbageValue = "-199223642" ) @Export("draw0") diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index c13b02e5f5..917483fd4e 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -525,7 +525,7 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("dz") @ObfuscatedSignature( - signature = "(IIIIII[BIZ)V", + descriptor = "(IIIIII[BIZ)V", garbageValue = "1" ) @Export("Rasterizer2D_drawGradientPixels") diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 3a65fbdf91..c1e7e2798c 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -53,7 +53,7 @@ public class Rasterizer3D extends Rasterizer2D { public static int[] Rasterizer3D_colorPalette; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ley;" + descriptor = "Ley;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; @@ -159,7 +159,7 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ley;)V" + descriptor = "(Ley;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index ae443c44c4..4354b9f0d9 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -41,7 +41,7 @@ public class RawPcmStream extends PcmStream { int field1504; @ObfuscatedSignature( - signature = "(Ldp;III)V" + descriptor = "(Ldp;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; @@ -56,7 +56,7 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedSignature( - signature = "(Ldp;II)V" + descriptor = "(Ldp;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; @@ -79,7 +79,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -88,7 +88,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldf;" + descriptor = "()Ldf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -508,7 +508,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Z)V", + descriptor = "(Z)V", garbageValue = "1" ) public synchronized void method2683() { @@ -842,7 +842,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ldp;II)Ldk;" + descriptor = "(Ldp;II)Ldk;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { @@ -851,7 +851,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ldp;III)Ldk;" + descriptor = "(Ldp;III)Ldk;" ) public static RawPcmStream method2674(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; @@ -859,7 +859,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "([B[IIIIIIILdk;)I" + descriptor = "([B[IIIIIIILdk;)I" ) static int method2723(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; @@ -890,7 +890,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdk;)I" + descriptor = "(I[B[IIIIIIIILdk;)I" ) static int method2742(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; @@ -941,7 +941,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("az") @ObfuscatedSignature( - signature = "([B[IIIIIIILdk;)I" + descriptor = "([B[IIIIIIILdk;)I" ) static int method2702(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; @@ -972,7 +972,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdk;)I" + descriptor = "(I[B[IIIIIIIILdk;)I" ) static int method2783(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; @@ -1023,7 +1023,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIILdk;II)I" ) static int method2740(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) { @@ -1056,7 +1056,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIILdk;II)I" ) static int method2705(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) { @@ -1098,7 +1098,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIILdk;II)I" ) static int method2706(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) { @@ -1131,7 +1131,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIILdk;II)I" ) static int method2707(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) { @@ -1171,7 +1171,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdk;)I" + descriptor = "([B[IIIIIIIILdk;)I" ) static int method2708(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; @@ -1212,7 +1212,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdk;)I" + descriptor = "(I[B[IIIIIIIIIILdk;)I" ) static int method2781(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; @@ -1278,7 +1278,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("be") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdk;)I" + descriptor = "([B[IIIIIIIILdk;)I" ) static int method2695(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; @@ -1319,7 +1319,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdk;)I" + descriptor = "(I[B[IIIIIIIIIILdk;)I" ) static int method2711(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; @@ -1385,7 +1385,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIILdk;II)I" ) static int method2712(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.field1495 -= var11.field1490 * var5; @@ -1425,7 +1425,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIIIILdk;II)I" ) static int method2738(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.field1494 -= var5 * var13.field1502; @@ -1476,7 +1476,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIILdk;II)I" ) static int method2767(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.field1495 -= var11.field1490 * var5; @@ -1516,7 +1516,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIIIILdk;II)I" ) static int method2672(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.field1494 -= var5 * var13.field1502; diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 2323a986cd..c3188df87b 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -38,7 +38,7 @@ public class RawSound extends AbstractSound { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldv;)Ldp;" + descriptor = "(Ldv;)Ldp;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 4b0773eb62..02e81c0691 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -46,7 +46,7 @@ public class ReflectionCheck extends Node { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1841893741" ) static int method2418(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 4e09e2246d..1d3d81a34e 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -43,7 +43,7 @@ public abstract class RouteStrategy { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIILfz;I)Z", + descriptor = "(IIILfz;I)Z", garbageValue = "-1966963917" ) @Export("hasArrived") diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 6f8a71f2b4..5b0906d3d3 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -59,7 +59,7 @@ public class Scene { static int Scene_cameraYawCosine; @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "[Lev;" + descriptor = "[Lev;" ) @Export("gameObjects") static GameObject[] gameObjects; @@ -92,7 +92,7 @@ public class Scene { static int[] Scene_planeOccluderCounts; @ObfuscatedName("av") @ObfuscatedSignature( - signature = "[[Lew;" + descriptor = "[[Lew;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; @@ -101,13 +101,13 @@ public class Scene { static int Scene_currentOccludersCount; @ObfuscatedName("at") @ObfuscatedSignature( - signature = "[Lew;" + descriptor = "[Lew;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; @@ -163,7 +163,7 @@ public class Scene { int[][][] tileHeights; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[[[Lea;" + descriptor = "[[[Lea;" ) @Export("tiles") Tile[][][] tiles; @@ -175,7 +175,7 @@ public class Scene { int tempGameObjectsCount; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Lev;" + descriptor = "[Lev;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; @@ -355,7 +355,7 @@ public class Scene { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIILel;JI)V" + descriptor = "(IIIILel;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { @@ -377,7 +377,7 @@ public class Scene { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIILel;JLel;Lel;)V" + descriptor = "(IIIILel;JLel;Lel;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { @@ -413,7 +413,7 @@ public class Scene { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIIILel;Lel;IIJI)V" + descriptor = "(IIIILel;Lel;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { @@ -441,7 +441,7 @@ public class Scene { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIIILel;Lel;IIIIJI)V" + descriptor = "(IIIILel;Lel;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { @@ -471,7 +471,7 @@ public class Scene { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIIIILel;IJI)Z" + descriptor = "(IIIIIILel;IJI)Z" ) public boolean method3356(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { if (var7 == null) { @@ -485,7 +485,7 @@ public class Scene { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIIILel;IJZ)Z" + descriptor = "(IIIIILel;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { @@ -524,7 +524,7 @@ public class Scene { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIILel;IJIIII)Z" + descriptor = "(IIIIILel;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { @@ -533,7 +533,7 @@ public class Scene { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIIIIIIILel;IZJI)Z" + descriptor = "(IIIIIIIILel;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { @@ -619,7 +619,7 @@ public class Scene { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lev;)V" + descriptor = "(Lev;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -719,7 +719,7 @@ public class Scene { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(III)Lez;" + descriptor = "(III)Lez;" ) public BoundaryObject method3213(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -728,7 +728,7 @@ public class Scene { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(III)Lep;" + descriptor = "(III)Lep;" ) public WallDecoration method3214(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -737,7 +737,7 @@ public class Scene { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(III)Lev;" + descriptor = "(III)Lev;" ) public GameObject method3215(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -757,7 +757,7 @@ public class Scene { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(III)Leu;" + descriptor = "(III)Leu;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -789,7 +789,7 @@ public class Scene { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - boolean var7 = class171.method3571(var8) == 2; + boolean var7 = class171.Entity_unpackType(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } @@ -875,7 +875,7 @@ public class Scene { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Lek;III)V" + descriptor = "(Lek;III)V" ) void method3283(ModelData var1, int var2, int var3, int var4) { Tile var5; @@ -916,7 +916,7 @@ public class Scene { @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Lek;IIIII)V" + descriptor = "(Lek;IIIII)V" ) void method3224(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; @@ -1037,13 +1037,13 @@ public class Scene { @ObfuscatedName("av") @Export("menuOpen") - public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3230() || var4) { + public void menuOpen(int plane, int mouseX, int mouseY, boolean walking) { + if (!shouldSendWalk() || walking) { checkClick = true; - viewportWalking = var4; - Scene_selectedPlane = var1; - Scene_selectedScreenX = var2; - Scene_selectedScreenY = var3; + viewportWalking = walking; + Scene_selectedPlane = plane; + Scene_selectedScreenX = mouseX; + Scene_selectedScreenY = mouseY; Scene_selectedX = -1; Scene_selectedY = -1; } @@ -1254,7 +1254,7 @@ public class Scene { @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Lea;Z)V" + descriptor = "(Lea;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1784,7 +1784,7 @@ public class Scene { @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lex;IIIIIII)V" + descriptor = "(Lex;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1895,7 +1895,7 @@ public class Scene { @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Lej;IIIIII)V" + descriptor = "(Lej;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -2541,12 +2541,14 @@ public class Scene { } @ObfuscatedName("at") - public static boolean method3230() { + @Export("shouldSendWalk") + public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; } @ObfuscatedName("aa") - public static void method3346() { + @Export("resetWalking") + public static void resetWalking() { Scene_selectedX = -1; viewportWalking = false; } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index db4c1ba62a..bdcee4aee0 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Script extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; @@ -48,7 +48,7 @@ public class Script extends DualNode { int stringArgumentCount; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Llf;" + descriptor = "[Llf;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -62,7 +62,7 @@ public class Script extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)[Llf;", + descriptor = "(II)[Llf;", garbageValue = "-978861309" ) @Export("newIterableNodeHashTable") diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index d40814559b..70ffe00968 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -14,7 +14,7 @@ public class ScriptEvent extends Node { static int field604; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) static IndexedSprite field597; @ObfuscatedName("az") @@ -30,7 +30,7 @@ public class ScriptEvent extends Node { boolean isMouseInputEvent; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("widget") Widget widget; @@ -54,7 +54,7 @@ public class ScriptEvent extends Node { int opIndex; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("dragTarget") Widget dragTarget; @@ -91,7 +91,7 @@ public class ScriptEvent extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Ljava/lang/Object;I)V", + descriptor = "([Ljava/lang/Object;I)V", garbageValue = "-2050703759" ) @Export("setArgs") @@ -101,7 +101,7 @@ public class ScriptEvent extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "20" ) @Export("setType") @@ -173,7 +173,7 @@ public class ScriptEvent extends Node { @ObfuscatedName("fv") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "303339948" ) @Export("setWindowedMode") @@ -203,7 +203,7 @@ public class ScriptEvent extends Node { @ObfuscatedName("hs") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", garbageValue = "-1977726761" ) @Export("insertMenuItemNoShift") diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 82cdd9c194..2f936f929c 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class ScriptFrame { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lcs;" + descriptor = "Lcs;" ) @Export("script") Script script; @@ -32,7 +32,7 @@ public class ScriptFrame { @ObfuscatedName("gb") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-32" ) static void method1201() { diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 8577f2fa32..1afc63eb00 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -11,13 +11,13 @@ import net.runelite.rs.ScriptOpcodes; public class SecureRandomCallable implements Callable { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("Widget_modelsArchive") static AbstractArchive Widget_modelsArchive; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) static Widget field544; @ObfuscatedName("cp") @@ -27,7 +27,7 @@ public class SecureRandomCallable implements Callable { public static int field546; @ObfuscatedName("ll") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) static Widget field542; @@ -40,7 +40,7 @@ public class SecureRandomCallable implements Callable { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1445802198" ) static int method1203(int var0, Script var1, boolean var2) { @@ -184,7 +184,7 @@ public class SecureRandomCallable implements Callable { @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "(Lby;IIB)V", + descriptor = "(Lby;IIB)V", garbageValue = "72" ) @Export("performPlayerAnimation") @@ -214,7 +214,7 @@ public class SecureRandomCallable implements Callable { @ObfuscatedName("hw") @ObfuscatedSignature( - signature = "(Lcu;III)V", + descriptor = "(Lcu;III)V", garbageValue = "9999999" ) static final void method1205(MenuAction var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 8050c73f23..6dd7becf51 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -32,7 +32,7 @@ public class SecureRandomFuture { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1768039353" ) @Export("shutdown") @@ -43,7 +43,7 @@ public class SecureRandomFuture { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-657646100" ) @Export("isDone") @@ -53,7 +53,7 @@ public class SecureRandomFuture { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Ljava/security/SecureRandom;", + descriptor = "(B)Ljava/security/SecureRandom;", garbageValue = "0" ) @Export("get") @@ -67,7 +67,7 @@ public class SecureRandomFuture { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I[BLlp;B)V", + descriptor = "(I[BLlp;B)V", garbageValue = "0" ) static void method2270(int var0, byte[] var1, ArchiveDisk var2) { @@ -94,7 +94,7 @@ public class SecureRandomFuture { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZB)I", + descriptor = "(Ljava/lang/CharSequence;IZB)I", garbageValue = "45" ) @Export("parseIntCustomRadix") @@ -160,7 +160,7 @@ public class SecureRandomFuture { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIIIZI)Llz;", + descriptor = "(IIIIIZI)Llz;", garbageValue = "-650607476" ) @Export("getItemSprite") @@ -292,7 +292,7 @@ public class SecureRandomFuture { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(ILcs;ZB)I", + descriptor = "(ILcs;ZB)I", garbageValue = "75" ) static int method2272(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 5e33bf0e92..67d910e8e3 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -9,31 +9,31 @@ import net.runelite.mapping.ObfuscatedSignature; public class SequenceDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("SequenceDefinition_archive") public static AbstractArchive SequenceDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("SequenceDefinition_animationsArchive") public static AbstractArchive SequenceDefinition_animationsArchive; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("SequenceDefinition_cached") static EvictingDualNodeHashTable SequenceDefinition_cached; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("SequenceDefinition_cachedFrames") static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; @@ -116,7 +116,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1837396411" ) @Export("decode") @@ -133,7 +133,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-1375281235" ) @Export("decodeNext") @@ -208,7 +208,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1490793911" ) @Export("postDecode") @@ -233,7 +233,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lef;II)Lef;", + descriptor = "(Lef;II)Lef;", garbageValue = "-1881625962" ) @Export("transformActorModel") @@ -252,7 +252,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lef;III)Lef;", + descriptor = "(Lef;III)Lef;", garbageValue = "-1040736484" ) @Export("transformObjectModel") @@ -288,7 +288,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lef;II)Lef;", + descriptor = "(Lef;II)Lef;", garbageValue = "-277583954" ) @Export("transformSpotAnimationModel") @@ -307,7 +307,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lef;ILjm;II)Lef;", + descriptor = "(Lef;ILjm;II)Lef;", garbageValue = "-864862384" ) @Export("applyTransformations") @@ -336,7 +336,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lef;IB)Lef;", + descriptor = "(Lef;IB)Lef;", garbageValue = "32" ) @Export("transformWidgetModel") @@ -371,7 +371,7 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("fc") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "1779036927" ) static final void method4973(boolean var0) { diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 8e55a9879b..3d52ca7fda 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -9,432 +9,432 @@ import net.runelite.mapping.ObfuscatedSignature; public class ServerPacket { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2191; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2177; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2200; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2156; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2211; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2158; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2219; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2228; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2161; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2169; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2224; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2164; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2155; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2166; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2167; @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2168; @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2181; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2170; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2232; @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2172; @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2173; @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2189; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2171; @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2176; @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2165; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2178; @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2175; @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2180; @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2240; @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2182; @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2183; @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2184; @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2185; @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2186; @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2187; @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2188; @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2160; @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2220; @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2162; @ObfuscatedName("al") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2159; @ObfuscatedName("an") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2199; @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2194; @ObfuscatedName("av") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2157; @ObfuscatedName("af") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2193; @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2197; @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2190; @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2223; @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2163; @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2201; @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2202; @ObfuscatedName("au") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2203; @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2204; @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2205; @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2206; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2207; @ObfuscatedName("be") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2208; @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2209; @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2210; @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2230; @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2212; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2213; @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2226; @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2215; @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2216; @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2217; @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2218; @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2196; @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2174; @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2221; @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2222; @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2235; @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2153; @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2225; @ObfuscatedName("br") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2195; @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2227; @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2233; @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2229; @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2179; @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2231; @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2214; @ObfuscatedName("ch") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2154; @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2234; @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2198; @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2236; @ObfuscatedName("cn") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2237; @ObfuscatedName("ce") @ObfuscatedSignature( - signature = "Lgu;" + descriptor = "Lgu;" ) public static final ServerPacket field2238; @ObfuscatedName("cj") diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 9064706f20..6e2e0109f8 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -57,7 +57,7 @@ public class Skeleton extends Node { @ObfuscatedName("iz") @ObfuscatedSignature( - signature = "(ZB)V", + descriptor = "(ZB)V", garbageValue = "38" ) @Export("setTapToDrop") @@ -67,7 +67,7 @@ public class Skeleton extends Node { @ObfuscatedName("jo") @ObfuscatedSignature( - signature = "([Lhd;IB)V", + descriptor = "([Lhd;IB)V", garbageValue = "34" ) @Export("runComponentCloseListeners") diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 2d17996541..2f8acf1dd7 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -29,7 +29,7 @@ public class Skills { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)[Lib;", + descriptor = "(B)[Lib;", garbageValue = "0" ) public static StudioGame[] method4272() { @@ -38,7 +38,7 @@ public class Skills { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-891910442" ) public static int method4271() { diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 68a0047766..d8a0e6bbd5 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -11,31 +11,31 @@ public class SoundCache { static boolean ItemDefinition_inMembersWorld; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("musicSamples") NodeHashTable musicSamples; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lle;" + descriptor = "Lle;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - signature = "(Lic;Lic;)V" + descriptor = "(Lic;Lic;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -46,7 +46,7 @@ public class SoundCache { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II[II)Ldp;", + descriptor = "(II[II)Ldp;", garbageValue = "-1808254786" ) @Export("getSoundEffect0") @@ -77,7 +77,7 @@ public class SoundCache { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II[II)Ldp;", + descriptor = "(II[II)Ldp;", garbageValue = "1029980223" ) @Export("getMusicSample0") @@ -114,7 +114,7 @@ public class SoundCache { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I[IB)Ldp;", + descriptor = "(I[IB)Ldp;", garbageValue = "-87" ) @Export("getSoundEffect") @@ -130,7 +130,7 @@ public class SoundCache { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I[II)Ldp;", + descriptor = "(I[II)Ldp;", garbageValue = "2095732620" ) @Export("getMusicSample") @@ -146,7 +146,7 @@ public class SoundCache { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "104" ) @Export("clearItemContainer") @@ -163,7 +163,7 @@ public class SoundCache { @ObfuscatedName("hu") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", + descriptor = "(ILjava/lang/String;I)V", garbageValue = "-717528882" ) static void method2647(int var0, String var1) { diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index a02d46de4e..a8c68d309e 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class SoundEffect { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Ldq;" + descriptor = "[Ldq;" ) @Export("instruments") Instrument[] instruments; @@ -20,7 +20,7 @@ public class SoundEffect { int end; @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -40,7 +40,7 @@ public class SoundEffect { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Ldp;" + descriptor = "()Ldp;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -124,7 +124,7 @@ public class SoundEffect { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;II)Ldr;" + descriptor = "(Lic;II)Ldr;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index b028401d84..92af9335fe 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -52,7 +52,7 @@ public class SoundEnvelope { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -64,7 +64,7 @@ public class SoundEnvelope { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 3866192e1e..068433b03b 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -15,13 +15,13 @@ public class SoundSystem implements Runnable { static int field1466; @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("headIconHintSprites") static Sprite[] headIconHintSprites; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Ldt;" + descriptor = "[Ldt;" ) @Export("players") volatile PcmPlayer[] players; @@ -46,16 +46,17 @@ public class SoundSystem implements Runnable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "101" ) - public static int method2628(int var0) { - return class279.method5159(ViewportMouse.ViewportMouse_entityTags[var0]); + @Export("getSceneXForObjectUnderMouse") + public static int getSceneXForObjectUnderMouse(int var0) { + return class279.Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var0]); } @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-123" ) public static void method2629() { @@ -75,7 +76,7 @@ public class SoundSystem implements Runnable { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1398391910" ) static int method2630(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 4d1ea197f1..6bc7efbd71 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -9,25 +9,25 @@ import net.runelite.mapping.ObfuscatedSignature; public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("SpotAnimationDefinition_archive") static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("SpotAnimationDefinition_cached") static EvictingDualNodeHashTable SpotAnimationDefinition_cached; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("SpotAnimationDefinition_cachedModels") static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("worldSelectFlagSprites") static IndexedSprite[] worldSelectFlagSprites; @@ -108,7 +108,7 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1363953407" ) @Export("decode") @@ -125,7 +125,7 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "-809461171" ) @Export("decodeNext") @@ -172,7 +172,7 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Lef;", + descriptor = "(IB)Lef;", garbageValue = "-31" ) @Export("getModel") diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 140279b00d..c466a1e886 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -45,7 +45,7 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()Llz;" + descriptor = "()Llz;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -66,7 +66,7 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Llz;" + descriptor = "()Llz;" ) @Export("copyNormalized") public Sprite copyNormalized() { diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 1392ccaca1..7b99e2a49a 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -35,7 +35,7 @@ public class SpriteMask extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)Z", + descriptor = "(III)Z", garbageValue = "-679501708" ) @Export("contains") @@ -62,7 +62,7 @@ public class SpriteMask extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "39704682" ) @Export("savePreferences") @@ -87,7 +87,7 @@ public class SpriteMask extends DualNode { @ObfuscatedName("km") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", + descriptor = "(Ljava/lang/String;ZI)V", garbageValue = "2008753616" ) @Export("findItemDefinitions") diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 3e475cbae2..053e88aa0f 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -8,19 +8,19 @@ import net.runelite.mapping.ObfuscatedSignature; public class StructDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("StructDefinition_cached") public static EvictingDualNodeHashTable StructDefinition_cached; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llf;" + descriptor = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -34,7 +34,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-98" ) @Export("postDecode") @@ -43,7 +43,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "381784776" ) @Export("decode") @@ -60,7 +60,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "337645419" ) @Export("decodeNext") @@ -73,7 +73,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "48203250" ) @Export("getIntParam") @@ -83,7 +83,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", garbageValue = "-1617799993" ) @Export("getStringParam") @@ -93,7 +93,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(S)[Lgu;", + descriptor = "(S)[Lgu;", garbageValue = "8211" ) @Export("ServerPacket_values") @@ -103,7 +103,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", garbageValue = "1817057195" ) public static String method4718(CharSequence[] var0, int var1, int var2) { @@ -142,7 +142,7 @@ public class StructDefinition extends DualNode { @ObfuscatedName("jb") @ObfuscatedSignature( - signature = "(Lhd;IIII)V", + descriptor = "(Lhd;IIII)V", garbageValue = "-1082386904" ) @Export("drawMinimap") diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 72ed2e445e..2d58d44203 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -9,37 +9,37 @@ import net.runelite.mapping.ObfuscatedSignature; public enum StudioGame implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) @Export("game3") game3("game3", "Game 3", 2), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) @Export("game4") game4("game4", "Game 4", 3), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) @Export("game5") game5("game5", "Game 5", 4), @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lib;" + descriptor = "Lib;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); @@ -64,7 +64,7 @@ public enum StudioGame implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -74,7 +74,7 @@ public enum StudioGame implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Ljz;", + descriptor = "(II)Ljz;", garbageValue = "916487028" ) @Export("getNpcDefinition") @@ -98,7 +98,7 @@ public enum StudioGame implements Enumerated { @ObfuscatedName("ih") @ObfuscatedSignature( - signature = "(IIIIII)V", + descriptor = "(IIIIII)V", garbageValue = "-1280022094" ) @Export("drawScrollBar") diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 8c58bfe57c..18236fc1f8 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Task { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfa;" + descriptor = "Lfa;" ) @Export("next") Task next; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index ef2ca3dc07..ca10fe2b73 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -19,18 +19,19 @@ public class TaskHandler implements Runnable { public static String javaVersion; @ObfuscatedName("jq") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) - static Widget field2066; + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lfa;" + descriptor = "Lfa;" ) @Export("current") Task current; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfa;" + descriptor = "Lfa;" ) @Export("task") Task task; @@ -63,7 +64,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "622783218" ) @Export("close") @@ -82,7 +83,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;I)Lfa;", + descriptor = "(IIILjava/lang/Object;I)Lfa;", garbageValue = "962190485" ) @Export("newTask") @@ -106,7 +107,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Lfa;", + descriptor = "(Ljava/lang/String;II)Lfa;", garbageValue = "746026781" ) @Export("newSocketTask") @@ -116,7 +117,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;II)Lfa;", + descriptor = "(Ljava/lang/Runnable;II)Lfa;", garbageValue = "2089571271" ) @Export("newThreadTask") @@ -174,7 +175,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", garbageValue = "-1144544095" ) public static void method3606(Applet var0, String var1) { @@ -187,7 +188,7 @@ public class TaskHandler implements Runnable { @ObfuscatedName("fa") @ObfuscatedSignature( - signature = "(Lcc;IB)V", + descriptor = "(Lcc;IB)V", garbageValue = "-73" ) @Export("updateActorSequence") diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 550cb52a28..a5470e03ff 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -37,7 +37,7 @@ public class Texture extends Node { boolean isLoaded; @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) Texture(Buffer var1) { this.isLoaded = false; @@ -84,7 +84,7 @@ public class Texture extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(DILic;)Z" + descriptor = "(DILic;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index bf0e426e64..4f3d17783e 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface TextureLoader { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)[I", + descriptor = "(II)[I", garbageValue = "1948753683" ) @Export("getTexturePixels") @@ -16,7 +16,7 @@ public interface TextureLoader { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "1038437362" ) @Export("getAverageTextureRGB") @@ -24,14 +24,14 @@ public interface TextureLoader { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "54" ) boolean vmethod3404(int var1); @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "18" ) @Export("isLowDetail") diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index ff9dee7566..a10d610e32 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -13,13 +13,13 @@ public class TextureProvider implements TextureLoader { static int[] Tiles_lightness; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Leo;" + descriptor = "[Leo;" ) @Export("textures") Texture[] textures; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljp;" + descriptor = "Ljp;" ) @Export("deque") NodeDeque deque; @@ -46,13 +46,13 @@ public class TextureProvider implements TextureLoader { int textureSize; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - signature = "(Lic;Lic;IDI)V" + descriptor = "(Lic;Lic;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -77,7 +77,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1846975444" ) @Export("getLoadedPercentage") @@ -117,7 +117,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)[I", + descriptor = "(II)[I", garbageValue = "1948753683" ) @Export("getTexturePixels") @@ -150,7 +150,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "1038437362" ) @Export("getAverageTextureRGB") @@ -160,7 +160,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "54" ) public boolean vmethod3404(int var1) { @@ -169,7 +169,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "18" ) @Export("isLowDetail") @@ -179,7 +179,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-426854674" ) @Export("clear") @@ -196,7 +196,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "245586965" ) @Export("animate") @@ -213,7 +213,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1729691421" ) static int method2888(int var0, Script var1, boolean var2) { @@ -331,7 +331,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", + descriptor = "(Ljava/lang/String;I)I", garbageValue = "1974416966" ) public static int method2873(String var0) { @@ -340,7 +340,7 @@ public class TextureProvider implements TextureLoader { @ObfuscatedName("gz") @ObfuscatedSignature( - signature = "(IIZB)V", + descriptor = "(IIZB)V", garbageValue = "-64" ) static final void method2900(int var0, int var1, boolean var2) { diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 73ab6a33f9..d7b053bc8a 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class Tile extends Node { @ObfuscatedName("df") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive9") static Archive archive9; @@ -39,37 +39,37 @@ public final class Tile extends Node { int originalPlane; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lex;" + descriptor = "Lex;" ) @Export("paint") TilePaint paint; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lej;" + descriptor = "Lej;" ) @Export("model") TileModel model; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lez;" + descriptor = "Lez;" ) @Export("boundaryObject") BoundaryObject boundaryObject; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lep;" + descriptor = "Lep;" ) @Export("wallDecoration") WallDecoration wallDecoration; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Leu;" + descriptor = "Leu;" ) @Export("floorDecoration") FloorDecoration floorDecoration; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Ldj;" + descriptor = "Ldj;" ) @Export("tileItemPile") TileItemPile tileItemPile; @@ -81,7 +81,7 @@ public final class Tile extends Node { int gameObjectsCount; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Lev;" + descriptor = "[Lev;" ) @Export("gameObjects") GameObject[] gameObjects; @@ -132,7 +132,7 @@ public final class Tile extends Node { int field1692; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lea;" + descriptor = "Lea;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -148,7 +148,7 @@ public final class Tile extends Node { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Lgj;", + descriptor = "(B)Lgj;", garbageValue = "3" ) public static PacketBufferNode method2990() { diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index d215d4965d..d1af4c6662 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -25,7 +25,7 @@ public final class TileItem extends Entity { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lef;", + descriptor = "(I)Lef;", garbageValue = "1832696685" ) @Export("getModel") @@ -35,7 +35,7 @@ public final class TileItem extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;II)Lhi;", + descriptor = "(Lic;II)Lhi;", garbageValue = "-1379318821" ) static MusicPatch method2255(AbstractArchive var0, int var1) { @@ -45,7 +45,7 @@ public final class TileItem extends Entity { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;B)V", + descriptor = "(Lic;B)V", garbageValue = "14" ) public static void method2256(AbstractArchive var0) { @@ -55,7 +55,7 @@ public final class TileItem extends Entity { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "16711935" ) @Export("isCharPrintable") @@ -71,7 +71,7 @@ public final class TileItem extends Entity { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-145657229" ) public static int method2259(int var0) { @@ -84,7 +84,7 @@ public final class TileItem extends Entity { @ObfuscatedName("fs") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "748561937" ) static final void method2260() { @@ -102,7 +102,7 @@ public final class TileItem extends Entity { @ObfuscatedName("gp") @ObfuscatedSignature( - signature = "(IIIIIIIIII)V", + descriptor = "(IIIIIIIIII)V", garbageValue = "393644147" ) @Export("updatePendingSpawn") diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index ea68e52239..0ef232313f 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -26,7 +26,7 @@ public final class TileItemPile { static int Client_plane; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("second") Entity second; @@ -50,13 +50,13 @@ public final class TileItemPile { int y; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("first") Entity first; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("third") Entity third; @@ -78,7 +78,7 @@ public final class TileItemPile { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)Ljava/lang/String;", + descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", garbageValue = "256" ) public static String method2903(String var0) { @@ -116,7 +116,7 @@ public final class TileItemPile { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "1884532154" ) static final void method2904(String var0) { @@ -130,7 +130,7 @@ public final class TileItemPile { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(ILcs;ZS)I", + descriptor = "(ILcs;ZS)I", garbageValue = "1024" ) static int method2902(int var0, Script var1, boolean var2) { @@ -309,7 +309,7 @@ public final class TileItemPile { @ObfuscatedName("gn") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-907670239" ) static final void method2901() { diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 55f6289bf7..86076f649f 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -67,7 +67,7 @@ public final class TilePaint { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIII)I", + descriptor = "(IIII)I", garbageValue = "1631719470" ) public static int method3187(int var0, int var1, int var2) { @@ -83,7 +83,7 @@ public final class TilePaint { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "215317048" ) public static void method3186() { @@ -97,7 +97,7 @@ public final class TilePaint { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "6" ) static void method3188() { diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 5dde27a7c6..5a826b9960 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -67,7 +67,7 @@ public final class Tiles { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", + descriptor = "(Ljava/lang/CharSequence;I)I", garbageValue = "492291254" ) @Export("parseInt") @@ -77,7 +77,7 @@ public final class Tiles { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1908314929" ) public static void method1200(int var0) { @@ -109,7 +109,7 @@ public final class Tiles { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIZIZI)V", + descriptor = "(IIIZIZI)V", garbageValue = "2067665025" ) @Export("doWorldSorting") @@ -139,7 +139,7 @@ public final class Tiles { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1760711343" ) static int method1199(int var0, Script var1, boolean var2) { @@ -250,7 +250,7 @@ public final class Tiles { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1187650171" ) static final int method1180() { @@ -259,7 +259,7 @@ public final class Tiles { @ObfuscatedName("ib") @ObfuscatedSignature( - signature = "([Lhd;IIIIIIIII)V", + descriptor = "([Lhd;IIIIIIIII)V", garbageValue = "-2136045116" ) @Export("drawInterface") diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 4946d22ef8..57461b9b70 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class Timer { @ObfuscatedName("hi") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("crossSprites") static Sprite[] crossSprites; @@ -76,7 +76,7 @@ public class Timer { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1434550274" ) public void method5162() { @@ -85,7 +85,7 @@ public class Timer { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1764633933" ) public void method5161() { @@ -98,7 +98,7 @@ public class Timer { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "457646537" ) public void method5184(int var1) { @@ -108,7 +108,7 @@ public class Timer { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-15" ) public void method5178() { @@ -123,7 +123,7 @@ public class Timer { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "535522707" ) public void method5165() { @@ -133,7 +133,7 @@ public class Timer { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-932156837" ) public void method5166() { @@ -142,7 +142,7 @@ public class Timer { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-152968698" ) @Export("write") @@ -158,7 +158,7 @@ public class Timer { @ObfuscatedName("fp") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2109175482" ) @Export("playPcmPlayers") @@ -175,7 +175,7 @@ public class Timer { @ObfuscatedName("gu") @ObfuscatedSignature( - signature = "(Lcc;IIIIIB)V", + descriptor = "(Lcc;IIIIIB)V", garbageValue = "103" ) @Export("drawActor2d") diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index ff0e723310..8ccdb2c290 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -18,19 +18,19 @@ import net.runelite.rs.Reflection; public class TriBool { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("TriBool_true") public static final TriBool TriBool_true; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkf;" + descriptor = "Lkf;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -46,7 +46,7 @@ public class TriBool { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;B)V", + descriptor = "(Lkb;B)V", garbageValue = "-64" ) @Export("performReflectionCheck") diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index a989b25d1d..508c47f00f 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -26,7 +26,7 @@ public class UrlRequest { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1247069155" ) @Export("isDone") @@ -36,7 +36,7 @@ public class UrlRequest { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[B", + descriptor = "(I)[B", garbageValue = "1076365281" ) @Export("getResponse") @@ -46,7 +46,7 @@ public class UrlRequest { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", garbageValue = "-2122321724" ) static void method3426(String var0, boolean var1, String var2, boolean var3) { @@ -78,7 +78,7 @@ public class UrlRequest { @ObfuscatedName("gx") @ObfuscatedSignature( - signature = "(IIIIB)V", + descriptor = "(IIIIB)V", garbageValue = "60" ) static final void method3432(int var0, int var1, int var2, int var3) { diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 4acf5e36b3..e9bb6a7955 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -23,7 +23,7 @@ public class UrlRequester implements Runnable { static int Interpreter_intStackSize; @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("redHintArrowSprite") static Sprite redHintArrowSprite; @@ -46,7 +46,7 @@ public class UrlRequester implements Runnable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/net/URL;I)Leb;", + descriptor = "(Ljava/net/URL;I)Leb;", garbageValue = "1883643384" ) @Export("request") @@ -61,7 +61,7 @@ public class UrlRequester implements Runnable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "1" ) @Export("close") @@ -133,7 +133,7 @@ public class UrlRequester implements Runnable { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(ILcs;ZB)I", + descriptor = "(ILcs;ZB)I", garbageValue = "23" ) static int method3424(int var0, Script var1, boolean var2) { @@ -269,7 +269,7 @@ public class UrlRequester implements Runnable { @ObfuscatedName("ia") @ObfuscatedSignature( - signature = "(S)I", + descriptor = "(S)I", garbageValue = "-5481" ) static final int method3421() { diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index a91c1b7686..77a5178392 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class User implements Comparable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkq;" + descriptor = "Lkq;" ) @Export("username") Username username; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lkq;" + descriptor = "Lkq;" ) @Export("previousUsername") Username previousUsername; @@ -24,7 +24,7 @@ public class User implements Comparable { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Lkq;", + descriptor = "(I)Lkq;", garbageValue = "352262046" ) @Export("getUsername") @@ -34,7 +34,7 @@ public class User implements Comparable { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", + descriptor = "(B)Ljava/lang/String;", garbageValue = "111" ) @Export("getName") @@ -44,7 +44,7 @@ public class User implements Comparable { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "-461021692" ) @Export("getPreviousName") @@ -54,7 +54,7 @@ public class User implements Comparable { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkq;Lkq;I)V", + descriptor = "(Lkq;Lkq;I)V", garbageValue = "-1982838307" ) @Export("set") @@ -69,7 +69,7 @@ public class User implements Comparable { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljf;I)I", + descriptor = "(Ljf;I)I", garbageValue = "334051838" ) @Export("compareTo_user") @@ -83,7 +83,7 @@ public class User implements Comparable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "406400151" ) static void method5228() { @@ -119,7 +119,7 @@ public class User implements Comparable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BI)V", + descriptor = "([BI)V", garbageValue = "-519092714" ) @Export("ByteArrayPool_release") diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 8657d62087..f403f6d0ac 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -17,7 +17,7 @@ public class UserComparator1 implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljf;Ljf;I)I", + descriptor = "(Ljf;Ljf;I)I", garbageValue = "1065681362" ) @Export("compare_bridged") diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 43c1a67c83..04dc525b8f 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("ef") @ObfuscatedSignature( - signature = "Llq;" + descriptor = "Llq;" ) @Export("spriteIds") static GraphicsDefaults spriteIds; @@ -23,7 +23,7 @@ public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;I)I", + descriptor = "(Lkx;Lkx;I)I", garbageValue = "-227570330" ) @Export("compareBuddy") @@ -41,7 +41,7 @@ public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("ks") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-856816613" ) static void method3522(String var0) { diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index f7129c055c..e8bef692c8 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -20,7 +20,7 @@ public class UserComparator2 implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljf;Ljf;I)I", + descriptor = "(Ljf;Ljf;I)I", garbageValue = "1905433483" ) @Export("compare_bridged") @@ -38,7 +38,7 @@ public class UserComparator2 implements Comparator { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1240194067" ) @Export("readReflectionCheck") diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index ec6e9a1c5d..6b408903f2 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -14,13 +14,13 @@ public class UserComparator3 extends AbstractUserComparator { static int field2009; @ObfuscatedName("gj") @ObfuscatedSignature( - signature = "Lem;" + descriptor = "Lem;" ) @Export("scene") static Scene scene; @ObfuscatedName("jf") @ObfuscatedSignature( - signature = "Ldu;" + descriptor = "Ldu;" ) @Export("textureProvider") static TextureProvider textureProvider; @@ -34,7 +34,7 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;I)I", + descriptor = "(Lkx;Lkx;I)I", garbageValue = "1287219897" ) @Export("compareBuddy") @@ -52,7 +52,7 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(CB)B", + descriptor = "(CB)B", garbageValue = "-48" ) @Export("charToByteCp1252") @@ -123,7 +123,7 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Lic;ZLko;S)V", + descriptor = "(Lic;Lic;ZLko;S)V", garbageValue = "22791" ) public static void method3548(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { @@ -136,7 +136,7 @@ public class UserComparator3 extends AbstractUserComparator { @ObfuscatedName("if") @ObfuscatedSignature( - signature = "(Lhd;IIZS)V", + descriptor = "(Lhd;IIZS)V", garbageValue = "1700" ) @Export("alignWidgetSize") diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index aa5093565a..8a31c9b855 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -17,7 +17,7 @@ public class UserComparator4 implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;I)I", + descriptor = "(Lkx;Lkx;I)I", garbageValue = "-1314738925" ) @Export("compare_bridged") @@ -35,7 +35,7 @@ public class UserComparator4 implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgn;Llb;I)Lgj;", + descriptor = "(Lgn;Llb;I)Lgj;", garbageValue = "527815306" ) @Export("getPacketBufferNode") @@ -69,7 +69,7 @@ public class UserComparator4 implements Comparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Lic;Lic;Lic;B)V", + descriptor = "(Lic;Lic;Lic;Lic;B)V", garbageValue = "-47" ) public static void method3495(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { @@ -83,7 +83,7 @@ public class UserComparator4 implements Comparator { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "-2121734057" ) @Export("loadInterface") @@ -125,7 +125,7 @@ public class UserComparator4 implements Comparator { @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "1503044626" ) @Export("runWidgetOnLoadListener") diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index deb0a9df23..4c7e8bad7e 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -16,7 +16,7 @@ public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;B)I", + descriptor = "(Lkx;Lkx;B)I", garbageValue = "0" ) @Export("compareBuddy") @@ -38,7 +38,7 @@ public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;IB)Ljava/lang/String;", + descriptor = "(Lkn;IB)Ljava/lang/String;", garbageValue = "2" ) static String method3534(Buffer var0, int var1) { @@ -59,7 +59,7 @@ public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("in") @ObfuscatedSignature( - signature = "(IIIIIIS)V", + descriptor = "(IIIIIIS)V", garbageValue = "-4011" ) static final void method3540(int var0, int var1, int var2, int var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 048896f832..9589c52a68 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -11,7 +11,7 @@ public class UserComparator6 extends AbstractUserComparator { static boolean[] Widget_loadedInterfaces; @ObfuscatedName("gp") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("mapSceneSprites") static IndexedSprite[] mapSceneSprites; @@ -25,7 +25,7 @@ public class UserComparator6 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;S)I", + descriptor = "(Lkx;Lkx;S)I", garbageValue = "2600" ) @Export("compareBuddy") @@ -43,7 +43,7 @@ public class UserComparator6 extends AbstractUserComparator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIB)I", + descriptor = "(IIB)I", garbageValue = "-59" ) @Export("ItemContainer_getCount") @@ -58,7 +58,7 @@ public class UserComparator6 extends AbstractUserComparator { @ObfuscatedName("gf") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "0" ) static void method3564() { diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 29b56a0d1e..e72f7c948c 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -14,7 +14,7 @@ public class UserComparator7 extends AbstractUserComparator { static int field2003; @ObfuscatedName("dv") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive6") static Archive archive6; @@ -28,7 +28,7 @@ public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;B)I", + descriptor = "(Lkx;Lkx;B)I", garbageValue = "-76" ) @Export("compareBuddy") @@ -46,7 +46,7 @@ public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Z", + descriptor = "(Ljava/lang/CharSequence;I)Z", garbageValue = "-71116023" ) @Export("isNumber") diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index f6e04e6e30..b2037d5c5a 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -23,7 +23,7 @@ public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;B)I", + descriptor = "(Lkx;Lkx;B)I", garbageValue = "101" ) @Export("compareBuddy") @@ -45,7 +45,7 @@ public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;B)V", + descriptor = "(Lic;B)V", garbageValue = "-79" ) public static void method3520(AbstractArchive var0) { diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 3daeafa733..57fd3ef26f 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) @Export("NetCache_reference") public static Buffer NetCache_reference; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lgz;" + descriptor = "Lgz;" ) @Export("clientLanguage") static Language clientLanguage; @@ -28,7 +28,7 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;I)I", + descriptor = "(Lkx;Lkx;I)I", garbageValue = "239506152" ) @Export("compareBuddy") @@ -46,7 +46,7 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)[Lgx;", + descriptor = "(I)[Lgx;", garbageValue = "-1951189301" ) static LoginPacket[] method3512() { @@ -55,7 +55,7 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "17173130" ) public static void method3509() { @@ -69,7 +69,7 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lic;IIIZB)V", + descriptor = "(Lic;IIIZB)V", garbageValue = "18" ) public static void method3513(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { @@ -84,7 +84,7 @@ public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("fx") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "41" ) @Export("playSong") diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index a697b6cfee..f2839382f5 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -24,7 +24,7 @@ public abstract class UserList { int size; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[Ljf;" + descriptor = "[Ljf;" ) @Export("array") User[] array; @@ -49,7 +49,7 @@ public abstract class UserList { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljf;", + descriptor = "(I)Ljf;", garbageValue = "551595115" ) @Export("newInstance") @@ -57,7 +57,7 @@ public abstract class UserList { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljf;", + descriptor = "(II)[Ljf;", garbageValue = "1959965595" ) @Export("newTypedArray") @@ -65,7 +65,7 @@ public abstract class UserList { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-830188441" ) @Export("clear") @@ -78,7 +78,7 @@ public abstract class UserList { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-729089769" ) @Export("getSize") @@ -88,7 +88,7 @@ public abstract class UserList { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "-38" ) @Export("isFull") @@ -98,7 +98,7 @@ public abstract class UserList { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lkq;I)Z", + descriptor = "(Lkq;I)Z", garbageValue = "-1632091525" ) @Export("contains") @@ -112,7 +112,7 @@ public abstract class UserList { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lkq;I)Ljf;", + descriptor = "(Lkq;I)Ljf;", garbageValue = "-1715419579" ) @Export("getByUsername") @@ -123,7 +123,7 @@ public abstract class UserList { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lkq;I)Ljf;", + descriptor = "(Lkq;I)Ljf;", garbageValue = "181197805" ) @Export("getByCurrentUsername") @@ -133,7 +133,7 @@ public abstract class UserList { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lkq;I)Ljf;", + descriptor = "(Lkq;I)Ljf;", garbageValue = "-1953560186" ) @Export("getByPreviousUsername") @@ -143,7 +143,7 @@ public abstract class UserList { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lkq;I)Z", + descriptor = "(Lkq;I)Z", garbageValue = "-1728392725" ) @Export("removeByUsername") @@ -159,7 +159,7 @@ public abstract class UserList { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljf;I)V", + descriptor = "(Ljf;I)V", garbageValue = "1431327027" ) @Export("remove") @@ -173,7 +173,7 @@ public abstract class UserList { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkq;I)Ljf;", + descriptor = "(Lkq;I)Ljf;", garbageValue = "1944275129" ) @Export("addLastNoPreviousUsername") @@ -183,7 +183,7 @@ public abstract class UserList { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkq;Lkq;B)Ljf;", + descriptor = "(Lkq;Lkq;B)Ljf;", garbageValue = "-18" ) @Export("addLast") @@ -201,7 +201,7 @@ public abstract class UserList { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(II)Ljf;", + descriptor = "(II)Ljf;", garbageValue = "421321691" ) @Export("get") @@ -215,7 +215,7 @@ public abstract class UserList { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1382907285" ) @Export("sort") @@ -230,7 +230,7 @@ public abstract class UserList { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Ljf;Lkq;Lkq;B)V", + descriptor = "(Ljf;Lkq;Lkq;B)V", garbageValue = "30" ) @Export("changeName") @@ -242,7 +242,7 @@ public abstract class UserList { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Ljf;I)I", + descriptor = "(Ljf;I)I", garbageValue = "-473551805" ) @Export("indexOf") @@ -258,7 +258,7 @@ public abstract class UserList { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ljf;S)V", + descriptor = "(Ljf;S)V", garbageValue = "28740" ) @Export("mapRemove") @@ -275,7 +275,7 @@ public abstract class UserList { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Ljf;B)V", + descriptor = "(Ljf;B)V", garbageValue = "-110" ) @Export("arrayAddLast") @@ -285,7 +285,7 @@ public abstract class UserList { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ljf;I)V", + descriptor = "(Ljf;I)V", garbageValue = "-810709212" ) @Export("mapPut") @@ -302,7 +302,7 @@ public abstract class UserList { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1444172767" ) @Export("arrayRemove") @@ -316,7 +316,7 @@ public abstract class UserList { @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "594179920" ) @Export("removeComparator") @@ -326,7 +326,7 @@ public abstract class UserList { @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;B)V", + descriptor = "(Ljava/util/Comparator;B)V", garbageValue = "-90" ) @Export("addComparator") @@ -341,7 +341,7 @@ public abstract class UserList { @ObfuscatedName("hj") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1614220910" ) static final void method5333() { diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index e1d52cf7ac..21e4b130e1 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -14,7 +14,7 @@ public class Username implements Comparable { String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lmo;)V" + descriptor = "(Ljava/lang/String;Lmo;)V" ) public Username(String var1, LoginType var2) { this.name = var1; @@ -23,7 +23,7 @@ public class Username implements Comparable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "-633298311" ) @Export("getName") @@ -33,7 +33,7 @@ public class Username implements Comparable { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "0" ) @Export("hasCleanName") @@ -43,7 +43,7 @@ public class Username implements Comparable { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkq;I)I", + descriptor = "(Lkq;I)I", garbageValue = "820506062" ) @Export("compareToTyped") @@ -84,7 +84,7 @@ public class Username implements Comparable { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II)I", + descriptor = "(Ljava/lang/CharSequence;II)I", garbageValue = "-794040320" ) public static int method5398(CharSequence var0, int var1) { diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 41b685745a..c77a481a2b 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface Usernamed { @ObfuscatedName("kr") @ObfuscatedSignature( - signature = "(B)Lkq;", + descriptor = "(B)Lkq;", garbageValue = "-76" ) @Export("username") diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 25b009924e..1a8df41045 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -9,13 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class VarbitDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; @@ -47,7 +47,7 @@ public class VarbitDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1405036764" ) @Export("decode") @@ -64,7 +64,7 @@ public class VarbitDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "692433347" ) @Export("decodeNext") @@ -79,7 +79,7 @@ public class VarbitDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Lis;", + descriptor = "(I)[Lis;", garbageValue = "-2057939908" ) @Export("PlayerType_values") @@ -89,7 +89,7 @@ public class VarbitDefinition extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lii;", + descriptor = "(II)Lii;", garbageValue = "-266354668" ) @Export("getParamDefinition") @@ -112,7 +112,7 @@ public class VarbitDefinition extends DualNode { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIII)I", + descriptor = "(IIII)I", garbageValue = "828959828" ) static final int method4696(int var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index dac3272608..0264696051 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -8,25 +8,25 @@ import net.runelite.mapping.ObfuscatedSignature; public class VarcInt extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("VarcInt_cached") public static EvictingDualNodeHashTable VarcInt_cached; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("ItemDefinition_archive") static AbstractArchive ItemDefinition_archive; @ObfuscatedName("eu") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive18") static Archive archive18; @@ -44,7 +44,7 @@ public class VarcInt extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "121" ) public void method4573(Buffer var1) { @@ -60,7 +60,7 @@ public class VarcInt extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1038318542" ) void method4569(Buffer var1, int var2) { @@ -72,7 +72,7 @@ public class VarcInt extends DualNode { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Ldf;I)V", + descriptor = "(Ldf;I)V", garbageValue = "1745274917" ) @Export("PcmStream_disable") diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 172fa6d532..60ba1e79b9 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -73,7 +73,7 @@ public class Varcs { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1324015283" ) @Export("setInt") @@ -87,7 +87,7 @@ public class Varcs { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "16" ) @Export("getInt") @@ -98,7 +98,7 @@ public class Varcs { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", + descriptor = "(ILjava/lang/String;I)V", garbageValue = "105969632" ) @Export("setString") @@ -108,7 +108,7 @@ public class Varcs { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", + descriptor = "(II)Ljava/lang/String;", garbageValue = "-1642204852" ) @Export("getString") @@ -119,7 +119,7 @@ public class Varcs { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)V", + descriptor = "(ILjava/lang/String;B)V", garbageValue = "14" ) @Export("setStringOld") @@ -129,7 +129,7 @@ public class Varcs { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", + descriptor = "(II)Ljava/lang/String;", garbageValue = "658470799" ) @Export("getStringOld") @@ -139,7 +139,7 @@ public class Varcs { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-943211657" ) @Export("clearTransient") @@ -159,7 +159,7 @@ public class Varcs { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ZI)Lmy;", + descriptor = "(ZI)Lmy;", garbageValue = "-297386898" ) @Export("getPreferencesFile") @@ -169,7 +169,7 @@ public class Varcs { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1923811872" ) @Export("write") @@ -283,7 +283,7 @@ public class Varcs { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-50" ) @Export("read") @@ -376,7 +376,7 @@ public class Varcs { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "999745813" ) @Export("tryWrite") @@ -389,7 +389,7 @@ public class Varcs { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "0" ) @Export("hasUnwrittenChanges") diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index e0e316435a..c2e5590a0b 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class VarpDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("VarpDefinition_archive") static AbstractArchive VarpDefinition_archive; @@ -21,7 +21,7 @@ public class VarpDefinition extends DualNode { public static int VarpDefinition_fileCount; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; @@ -42,7 +42,7 @@ public class VarpDefinition extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "319289372" ) @Export("decode") @@ -59,7 +59,7 @@ public class VarpDefinition extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1792997667" ) @Export("decodeNext") diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index bb617ec988..d54c6b5b2f 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -31,7 +31,7 @@ public class Varps { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(CB)Z", + descriptor = "(CB)Z", garbageValue = "72" ) @Export("isAlphaNumeric") diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 8915ed6da8..db689b75bd 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class VertexNormal { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Leb;" + descriptor = "Leb;" ) @Export("World_request") static UrlRequest World_request; @@ -42,7 +42,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Let;)V" + descriptor = "(Let;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index a6c2fdbdd0..4a929d0d64 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -12,18 +12,18 @@ import net.runelite.mapping.ObfuscatedSignature; public enum VerticalAlignment implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lif;" + descriptor = "Lif;" ) field3226(2, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lif;" + descriptor = "Lif;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lif;" + descriptor = "Lif;" ) field3230(0, 2); @@ -47,7 +47,7 @@ public enum VerticalAlignment implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -57,7 +57,7 @@ public enum VerticalAlignment implements Enumerated { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Lcs;", + descriptor = "(III)Lcs;", garbageValue = "1496312280" ) static Script method4517(int var0, int var1) { @@ -90,7 +90,7 @@ public enum VerticalAlignment implements Enumerated { @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "735302127" ) @Export("getGcDuration") diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index ec921d0449..1e20fc7040 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -66,7 +66,7 @@ public class ViewportMouse { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIB)I", + descriptor = "(IIB)I", garbageValue = "-104" ) public static int method3091(int var0, int var1) { @@ -75,7 +75,7 @@ public class ViewportMouse { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "998588366" ) public static boolean method3071(char var0) { diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index d84d61692e..e94b08c00a 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -23,25 +23,25 @@ public class VorbisSample extends Node { static int VorbisSample_blockSize1; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Ldl;" + descriptor = "[Ldl;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Ldc;" + descriptor = "[Ldc;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lde;" + descriptor = "[Lde;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "[Ldz;" + descriptor = "[Ldz;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; @@ -399,7 +399,7 @@ public class VorbisSample extends Node { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "([I)Ldp;" + descriptor = "([I)Ldp;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -614,7 +614,7 @@ public class VorbisSample extends Node { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lic;)Z" + descriptor = "(Lic;)Z" ) static boolean method2500(AbstractArchive var0) { if (!field1416) { @@ -632,7 +632,7 @@ public class VorbisSample extends Node { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lic;II)Ldi;" + descriptor = "(Lic;II)Ldi;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 806ae72796..7e18d29a7a 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -51,13 +51,13 @@ public final class WallDecoration { int yOffset; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("entity1") public Entity entity1; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lel;" + descriptor = "Lel;" ) @Export("entity2") public Entity entity2; @@ -81,7 +81,7 @@ public final class WallDecoration { @ObfuscatedName("fu") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "764201281" ) @Export("doCheat") @@ -142,35 +142,35 @@ public final class WallDecoration { @ObfuscatedName("ir") @ObfuscatedSignature( - signature = "(Lhd;Ljo;IIZI)V", + descriptor = "(Lhd;Ljo;IIZI)V", garbageValue = "-771039466" ) @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; - byte var6 = -1; - String var7 = null; - if (var5 != null && var5[var3] != null) { - if (var3 == 0) { - var6 = 33; - } else if (var3 == 1) { - var6 = 34; - } else if (var3 == 2) { - var6 = 35; - } else if (var3 == 3) { - var6 = 36; + static final void addWidgetItemMenuItem(Widget widget, ItemDefinition itemDef, int slotIdx, int actionIdx, boolean forceLeftClick) { + String[] itemActions = itemDef.inventoryActions; + byte opcode = -1; + String action = null; + if (itemActions != null && itemActions[actionIdx] != null) { + if (actionIdx == 0) { + opcode = 33; + } else if (actionIdx == 1) { + opcode = 34; + } else if (actionIdx == 2) { + opcode = 35; + } else if (actionIdx == 3) { + opcode = 36; } else { - var6 = 37; + opcode = 37; } - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; + action = itemActions[actionIdx]; + } else if (actionIdx == 4) { + opcode = 37; + action = "Drop"; } - if (var6 != -1 && var7 != null) { - ApproximateRouteStrategy.insertMenuItem(var7, ItemContainer.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + if (opcode != -1 && action != null) { + ApproximateRouteStrategy.insertMenuItem(action, ItemContainer.colorStartTag(16748608) + itemDef.name, opcode, itemDef.id, slotIdx, widget.id, forceLeftClick); } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 11c2137794..5f8e7c17cf 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -9,37 +9,37 @@ import net.runelite.mapping.ObfuscatedSignature; public class Widget extends Node { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[[Lhd;" + descriptor = "[[Lhd;" ) @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("Widget_archive") static AbstractArchive Widget_archive; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; @@ -222,7 +222,7 @@ public class Widget extends Node { public boolean fill; @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Llw;" + descriptor = "Llw;" ) @Export("fillMode") public class332 fillMode; @@ -440,8 +440,8 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = 1451565177 ) - @Export("clickMask") - public int clickMask; + @Export("flags") + public int flags; @ObfuscatedName("cq") public boolean field2709; @ObfuscatedName("co") @@ -460,7 +460,7 @@ public class Widget extends Node { public String[] actions; @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("parent") public Widget parent; @@ -630,7 +630,7 @@ public class Widget extends Node { public int modelFrameCycle; @ObfuscatedName("ee") @ObfuscatedSignature( - signature = "[Lhd;" + descriptor = "[Lhd;" ) @Export("children") public Widget[] children; @@ -681,7 +681,8 @@ public class Widget extends Node { @Export("noScrollThrough") public boolean noScrollThrough; @ObfuscatedName("fn") - public boolean field2744; + @Export("prioritizeMenuEntry") + public boolean prioritizeMenuEntry; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); @@ -759,7 +760,7 @@ public class Widget extends Node { this.textShadowed = false; this.paddingX = 0; this.paddingY = 0; - this.clickMask = 0; + this.flags = 0; this.field2709 = false; this.dataText = ""; this.parent = null; @@ -785,12 +786,12 @@ public class Widget extends Node { this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2744 = false; + this.prioritizeMenuEntry = false; } @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;S)V", + descriptor = "(Lkn;S)V", garbageValue = "27305" ) @Export("decodeLegacy") @@ -863,22 +864,22 @@ public class Widget extends Node { this.itemQuantities = new int[this.rawWidth * this.rawHeight]; var4 = var1.readUnsignedByte(); if (var4 == 1) { - this.clickMask |= 268435456; + this.flags |= 268435456; } var5 = var1.readUnsignedByte(); if (var5 == 1) { - this.clickMask |= 1073741824; + this.flags |= 1073741824; } var6 = var1.readUnsignedByte(); if (var6 == 1) { - this.clickMask |= Integer.MIN_VALUE; + this.flags |= Integer.MIN_VALUE; } int var7 = var1.readUnsignedByte(); if (var7 == 1) { - this.clickMask |= 536870912; + this.flags |= 536870912; } this.paddingX = var1.readUnsignedByte(); @@ -905,7 +906,7 @@ public class Widget extends Node { String var10 = var1.readStringCp1252NullTerminated(); if (var10.length() > 0) { this.itemActions[var8] = var10; - this.clickMask |= 1 << var8 + 23; + this.flags |= 1 << var8 + 23; } } } @@ -989,7 +990,7 @@ public class Widget extends Node { this.paddingY = var1.readShort(); var4 = var1.readUnsignedByte(); if (var4 == 1) { - this.clickMask |= 1073741824; + this.flags |= 1073741824; } this.itemActions = new String[5]; @@ -998,7 +999,7 @@ public class Widget extends Node { String var11 = var1.readStringCp1252NullTerminated(); if (var11.length() > 0) { this.itemActions[var5] = var11; - this.clickMask |= 1 << var5 + 23; + this.flags |= 1 << var5 + 23; } } } @@ -1011,7 +1012,7 @@ public class Widget extends Node { this.spellActionName = var1.readStringCp1252NullTerminated(); this.spellName = var1.readStringCp1252NullTerminated(); var4 = var1.readUnsignedShort() & 63; - this.clickMask |= var4 << 11; + this.flags |= var4 << 11; } if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { @@ -1036,18 +1037,18 @@ public class Widget extends Node { } if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { - this.clickMask |= 4194304; + this.flags |= 4194304; } if (this.buttonType == 6) { - this.clickMask |= 1; + this.flags |= 1; } } @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "0" ) @Export("decode") @@ -1149,7 +1150,7 @@ public class Widget extends Node { this.field2633 = var1.readUnsignedByte() == 1; } - this.clickMask = var1.readMedium(); + this.flags = var1.readMedium(); this.dataText = var1.readStringCp1252NullTerminated(); int var2 = var1.readUnsignedByte(); if (var2 > 0) { @@ -1189,7 +1190,7 @@ public class Widget extends Node { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkn;I)[Ljava/lang/Object;", + descriptor = "(Lkn;I)[Ljava/lang/Object;", garbageValue = "2034218421" ) @Export("readListener") @@ -1216,7 +1217,7 @@ public class Widget extends Node { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lkn;S)[I", + descriptor = "(Lkn;S)[I", garbageValue = "-3542" ) @Export("readListenerTriggers") @@ -1237,7 +1238,7 @@ public class Widget extends Node { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "429586427" ) @Export("swapItems") @@ -1252,7 +1253,7 @@ public class Widget extends Node { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ZB)Llz;", + descriptor = "(ZB)Llz;", garbageValue = "1" ) @Export("getSprite") @@ -1311,7 +1312,7 @@ public class Widget extends Node { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)Lko;", + descriptor = "(B)Lko;", garbageValue = "24" ) @Export("getFont") @@ -1338,7 +1339,7 @@ public class Widget extends Node { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Llz;", + descriptor = "(II)Llz;", garbageValue = "2132771251" ) @Export("getInventorySprite") @@ -1370,7 +1371,7 @@ public class Widget extends Node { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljm;IZLhv;I)Lef;", + descriptor = "(Ljm;IZLhv;I)Lef;", garbageValue = "-893461893" ) @Export("getModel") @@ -1452,7 +1453,7 @@ public class Widget extends Node { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ZI)Lhh;", + descriptor = "(ZI)Lhh;", garbageValue = "-1801496414" ) @Export("getSpriteMask") @@ -1511,7 +1512,7 @@ public class Widget extends Node { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)V", + descriptor = "(ILjava/lang/String;I)V", garbageValue = "1766154663" ) @Export("setAction") @@ -1532,7 +1533,7 @@ public class Widget extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "863764794" ) @Export("getVarbit") diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 0aa20c972f..0e73f01c48 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class World { @ObfuscatedName("po") @ObfuscatedSignature( - signature = "Lls;" + descriptor = "Lls;" ) @Export("privateChatMode") static PrivateChatMode privateChatMode; @@ -80,7 +80,7 @@ public class World { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1952948484" ) @Export("isMembersOnly") @@ -90,7 +90,7 @@ public class World { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-964696384" ) boolean method1874() { @@ -99,7 +99,7 @@ public class World { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1522011023" ) @Export("isPvp") @@ -109,7 +109,7 @@ public class World { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1974803313" ) boolean method1841() { @@ -118,7 +118,7 @@ public class World { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "15" ) @Export("isDeadman") @@ -128,7 +128,7 @@ public class World { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "607891956" ) @Export("isBeta") @@ -138,7 +138,7 @@ public class World { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1312079731" ) boolean method1835() { @@ -147,7 +147,7 @@ public class World { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIILga;Lfz;I)Z", + descriptor = "(IIILga;Lfz;I)Z", garbageValue = "1323151453" ) static final boolean method1856(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { @@ -361,7 +361,7 @@ public class World { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lko;Lko;Lko;B)V", + descriptor = "(Lko;Lko;Lko;B)V", garbageValue = "-14" ) @Export("drawTitle") diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 0382434249..64d4f76e7d 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -15,43 +15,43 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMap { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lke;" + descriptor = "Lke;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lko;" + descriptor = "Lko;" ) @Export("font") Font font; @@ -60,7 +60,7 @@ public class WorldMap { HashMap fonts; @ObfuscatedName("k") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; @@ -69,30 +69,30 @@ public class WorldMap { HashMap details; @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lad;" + descriptor = "Lad;" ) @Export("mainMapArea") WorldMapArea mainMapArea; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lad;" + descriptor = "Lad;" ) @Export("currentMapArea") WorldMapArea currentMapArea; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lad;" + descriptor = "Lad;" ) WorldMapArea field3984; @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Laa;" + descriptor = "Laa;" ) @Export("worldMapManager") WorldMapManager worldMapManager; @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lml;" + descriptor = "Lml;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; @@ -248,7 +248,7 @@ public class WorldMap { HashSet field3978; @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Lhg;" + descriptor = "Lhg;" ) @Export("mouseCoord") Coord mouseCoord; @@ -257,7 +257,7 @@ public class WorldMap { public boolean showCoord; @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("sprite") Sprite sprite; @@ -326,7 +326,7 @@ public class WorldMap { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Lic;Lic;Lko;Ljava/util/HashMap;[Llh;I)V", + descriptor = "(Lic;Lic;Lic;Lko;Ljava/util/HashMap;[Llh;I)V", garbageValue = "-2031713861" ) @Export("init") @@ -361,7 +361,7 @@ public class WorldMap { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "19" ) public void method6696() { @@ -370,7 +370,7 @@ public class WorldMap { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIZIIIII)V", + descriptor = "(IIZIIIII)V", garbageValue = "2116125643" ) @Export("onCycle") @@ -421,7 +421,7 @@ public class WorldMap { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIZZB)V", + descriptor = "(IIZZB)V", garbageValue = "69" ) public void method6693(int var1, int var2, boolean var3, boolean var4) { @@ -488,7 +488,7 @@ public class WorldMap { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "422650301" ) @Export("smoothZoom") @@ -509,7 +509,7 @@ public class WorldMap { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2119991272" ) @Export("scrollToTarget") @@ -536,7 +536,7 @@ public class WorldMap { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIZB)V", + descriptor = "(IIZB)V", garbageValue = "83" ) @Export("setWorldMapPosition") @@ -552,7 +552,7 @@ public class WorldMap { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1330915767" ) final void method6529() { @@ -564,7 +564,7 @@ public class WorldMap { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-2089729451" ) @Export("hasTarget") @@ -574,7 +574,7 @@ public class WorldMap { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIII)Lad;", + descriptor = "(IIII)Lad;", garbageValue = "-342923578" ) @Export("mapAreaAtCoord") @@ -595,7 +595,7 @@ public class WorldMap { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIZI)V", + descriptor = "(IIIZI)V", garbageValue = "-1486444716" ) public void method6532(int var1, int var2, int var3, boolean var4) { @@ -623,7 +623,7 @@ public class WorldMap { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1476612822" ) @Export("setCurrentMapAreaId") @@ -637,7 +637,7 @@ public class WorldMap { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "96" ) @Export("currentMapAreaId") @@ -647,7 +647,7 @@ public class WorldMap { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)Lad;", + descriptor = "(I)Lad;", garbageValue = "-434939978" ) @Export("getCurrentMapArea") @@ -657,7 +657,7 @@ public class WorldMap { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "1435320921" ) @Export("setCurrentMapArea") @@ -670,7 +670,7 @@ public class WorldMap { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "1169619542" ) @Export("initializeWorldMapManager") @@ -682,7 +682,7 @@ public class WorldMap { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lad;Lhg;Lhg;ZB)V", + descriptor = "(Lad;Lhg;Lhg;ZB)V", garbageValue = "-3" ) public void method6538(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { @@ -702,7 +702,7 @@ public class WorldMap { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "662676533" ) @Export("jump") @@ -726,7 +726,7 @@ public class WorldMap { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIIIB)V", + descriptor = "(IIIIIB)V", garbageValue = "45" ) @Export("draw") @@ -788,7 +788,7 @@ public class WorldMap { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIIIII)Z", + descriptor = "(IIIIIII)Z", garbageValue = "1450598957" ) boolean method6565(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -811,7 +811,7 @@ public class WorldMap { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IIIIIIB)V", + descriptor = "(IIIIIIB)V", garbageValue = "0" ) void method6603(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -854,7 +854,7 @@ public class WorldMap { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "371539895" ) @Export("drawOverview") @@ -873,7 +873,7 @@ public class WorldMap { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "2046053399" ) @Export("setZoomPercentage") @@ -883,7 +883,7 @@ public class WorldMap { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(IIIIII)V", + descriptor = "(IIIIII)V", garbageValue = "-911619085" ) @Export("drawLoading") @@ -899,7 +899,7 @@ public class WorldMap { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(II)F", + descriptor = "(II)F", garbageValue = "-101273681" ) @Export("getZoomFromPercentage") @@ -919,7 +919,7 @@ public class WorldMap { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1432703186" ) @Export("getZoomLevel") @@ -939,7 +939,7 @@ public class WorldMap { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-344269271" ) @Export("loadCache") @@ -949,7 +949,7 @@ public class WorldMap { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-2083683127" ) @Export("isCacheLoaded") @@ -959,7 +959,7 @@ public class WorldMap { @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(II)Lad;", + descriptor = "(II)Lad;", garbageValue = "173267923" ) @Export("getMapArea") @@ -980,7 +980,7 @@ public class WorldMap { @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "124476569" ) @Export("setWorldMapPositionTarget") @@ -993,7 +993,7 @@ public class WorldMap { @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "796383009" ) @Export("setWorldMapPositionTargetInstant") @@ -1007,7 +1007,7 @@ public class WorldMap { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(IIIB)V", + descriptor = "(IIIB)V", garbageValue = "-86" ) @Export("jumpToSourceCoord") @@ -1023,7 +1023,7 @@ public class WorldMap { @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "1641941372" ) @Export("jumpToSourceCoordInstant") @@ -1039,7 +1039,7 @@ public class WorldMap { @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-2103537124" ) @Export("getDisplayX") @@ -1049,7 +1049,7 @@ public class WorldMap { @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "692721192" ) @Export("getDisplayY") @@ -1059,7 +1059,7 @@ public class WorldMap { @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(I)Lhg;", + descriptor = "(I)Lhg;", garbageValue = "-1863746595" ) @Export("getDisplayCoord") @@ -1069,7 +1069,7 @@ public class WorldMap { @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1645904359" ) @Export("getDisplayWith") @@ -1079,7 +1079,7 @@ public class WorldMap { @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1582823724" ) @Export("getDisplayHeight") @@ -1089,7 +1089,7 @@ public class WorldMap { @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "1740193117" ) @Export("setMaxFlashCount") @@ -1102,7 +1102,7 @@ public class WorldMap { @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-316454776" ) @Export("resetMaxFlashCount") @@ -1112,7 +1112,7 @@ public class WorldMap { @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "51" ) @Export("setCyclesPerFlash") @@ -1125,7 +1125,7 @@ public class WorldMap { @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2071944062" ) @Export("resetCyclesPerFlash") @@ -1135,7 +1135,7 @@ public class WorldMap { @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-999392835" ) @Export("setPerpetualFlash") @@ -1145,7 +1145,7 @@ public class WorldMap { @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "106" ) @Export("flashElement") @@ -1158,7 +1158,7 @@ public class WorldMap { @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-1070811489" ) @Export("flashCategory") @@ -1177,7 +1177,7 @@ public class WorldMap { @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "8454016" ) @Export("stopCurrentFlashes") @@ -1187,7 +1187,7 @@ public class WorldMap { @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-74185669" ) @Export("setElementsDisabled") @@ -1197,7 +1197,7 @@ public class WorldMap { @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "(IZI)V", + descriptor = "(IZI)V", garbageValue = "1502020559" ) @Export("disableElement") @@ -1213,7 +1213,7 @@ public class WorldMap { @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(IZI)V", + descriptor = "(IZI)V", garbageValue = "-324596356" ) @Export("setCategoryDisabled") @@ -1240,7 +1240,7 @@ public class WorldMap { @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "-45" ) @Export("getElementsDisabled") @@ -1250,7 +1250,7 @@ public class WorldMap { @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(IS)Z", + descriptor = "(IS)Z", garbageValue = "-10758" ) @Export("isElementDisabled") @@ -1260,7 +1260,7 @@ public class WorldMap { @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(IS)Z", + descriptor = "(IS)Z", garbageValue = "24518" ) @Export("isCategoryDisabled") @@ -1270,7 +1270,7 @@ public class WorldMap { @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "32" ) void method6573() { @@ -1281,7 +1281,7 @@ public class WorldMap { @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(IIIIIIB)V", + descriptor = "(IIIIIIB)V", garbageValue = "-102" ) @Export("addElementMenuOptions") @@ -1317,7 +1317,7 @@ public class WorldMap { @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(ILhg;I)Lhg;", + descriptor = "(ILhg;I)Lhg;", garbageValue = "-1210676807" ) public Coord method6575(int var1, Coord var2) { @@ -1363,7 +1363,7 @@ public class WorldMap { @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(IILhg;Lhg;I)V", + descriptor = "(IILhg;Lhg;I)V", garbageValue = "346883599" ) @Export("worldMapMenuAction") @@ -1393,7 +1393,7 @@ public class WorldMap { @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(I)Laf;", + descriptor = "(I)Laf;", garbageValue = "-1116444098" ) @Export("iconStart") @@ -1419,7 +1419,7 @@ public class WorldMap { @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(B)Laf;", + descriptor = "(B)Laf;", garbageValue = "-42" ) @Export("iconNext") diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index c05cb79825..35ea39f7f8 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -12,7 +12,7 @@ public class WorldMapArchiveLoader { String cacheName; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("archive") AbstractArchive archive; @@ -27,7 +27,7 @@ public class WorldMapArchiveLoader { boolean loaded; @ObfuscatedSignature( - signature = "(Lic;)V" + descriptor = "(Lic;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -37,7 +37,7 @@ public class WorldMapArchiveLoader { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "796588704" ) @Export("reset") @@ -54,7 +54,7 @@ public class WorldMapArchiveLoader { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1901724660" ) @Export("load") @@ -89,7 +89,7 @@ public class WorldMapArchiveLoader { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-1377768408" ) @Export("isLoaded") @@ -99,7 +99,7 @@ public class WorldMapArchiveLoader { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1099667221" ) @Export("getPercentLoaded") diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 7802838d48..cd4b048470 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -38,7 +38,7 @@ public class WorldMapArea { int zoom; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhg;" + descriptor = "Lhg;" ) @Export("origin") Coord origin; @@ -87,7 +87,7 @@ public class WorldMapArea { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1711579729" ) @Export("read") @@ -112,7 +112,7 @@ public class WorldMapArea { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)Law;", + descriptor = "(Lkn;B)Law;", garbageValue = "-69" ) @Export("readWorldMapSection") @@ -144,7 +144,7 @@ public class WorldMapArea { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIII)Z", + descriptor = "(IIII)Z", garbageValue = "303739781" ) @Export("containsCoord") @@ -165,7 +165,7 @@ public class WorldMapArea { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "111" ) @Export("containsPosition") @@ -196,7 +196,7 @@ public class WorldMapArea { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIII)[I", + descriptor = "(IIII)[I", garbageValue = "1838178690" ) @Export("position") @@ -217,7 +217,7 @@ public class WorldMapArea { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(III)Lhg;", + descriptor = "(III)Lhg;", garbageValue = "-1660127351" ) @Export("coord") @@ -238,7 +238,7 @@ public class WorldMapArea { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "61" ) @Export("setBounds") @@ -254,7 +254,7 @@ public class WorldMapArea { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-659291236" ) @Export("getId") @@ -264,7 +264,7 @@ public class WorldMapArea { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "-2131690602" ) @Export("getIsMain") @@ -274,7 +274,7 @@ public class WorldMapArea { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "-1380863043" ) @Export("getInternalName") @@ -284,7 +284,7 @@ public class WorldMapArea { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", + descriptor = "(I)Ljava/lang/String;", garbageValue = "657919972" ) @Export("getExternalName") @@ -294,7 +294,7 @@ public class WorldMapArea { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "49" ) @Export("getBackGroundColor") @@ -304,7 +304,7 @@ public class WorldMapArea { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "24" ) @Export("getZoom") @@ -314,7 +314,7 @@ public class WorldMapArea { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1324174996" ) @Export("getRegionLowX") @@ -324,7 +324,7 @@ public class WorldMapArea { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "103" ) @Export("getRegionHighX") @@ -334,7 +334,7 @@ public class WorldMapArea { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1253585407" ) @Export("getRegionLowY") @@ -344,7 +344,7 @@ public class WorldMapArea { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1154975420" ) @Export("getRegionHighY") @@ -354,7 +354,7 @@ public class WorldMapArea { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1645493175" ) @Export("getOriginX") @@ -364,7 +364,7 @@ public class WorldMapArea { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "680709831" ) @Export("getOriginPlane") @@ -374,7 +374,7 @@ public class WorldMapArea { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-734959342" ) @Export("getOriginY") @@ -384,7 +384,7 @@ public class WorldMapArea { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Lhg;", + descriptor = "(I)Lhg;", garbageValue = "-1903361332" ) @Export("getOrigin") @@ -394,7 +394,7 @@ public class WorldMapArea { @ObfuscatedName("hf") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "1010580353" ) @Export("resumePauseWidget") diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index b50bdf8f38..1fa47cfccc 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -24,7 +24,7 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(Lkn;Lkn;IZI)V", + descriptor = "(Lkn;Lkn;IZI)V", garbageValue = "442767924" ) @Export("init") @@ -66,7 +66,7 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(Lkn;ZI)V", + descriptor = "(Lkn;ZI)V", garbageValue = "-380421071" ) @Export("initIconsList") @@ -87,7 +87,7 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BI)Lcs;", + descriptor = "([BI)Lcs;", garbageValue = "1792640289" ) @Export("newScript") @@ -159,7 +159,7 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", + descriptor = "(Ljava/lang/CharSequence;B)I", garbageValue = "47" ) public static int method759(CharSequence var0) { @@ -175,7 +175,7 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("ic") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", + descriptor = "(II)Ljava/lang/String;", garbageValue = "803969817" ) @Export("formatItemStacks") @@ -195,11 +195,12 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedName("kk") @ObfuscatedSignature( - signature = "(Lhd;B)Ljava/lang/String;", + descriptor = "(Lhd;B)Ljava/lang/String;", garbageValue = "-51" ) - static String method762(Widget var0) { - if (WorldMapID.method617(KeyHandler.getWidgetClickMask(var0)) == 0) { + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var0)) == 0) { return null; } else { return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 2acccd0942..28ac9e0cd1 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -14,27 +14,27 @@ public class WorldMapCacheName { static int field329; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lat;" + descriptor = "Lat;" ) public static final WorldMapCacheName field322; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lat;" + descriptor = "Lat;" ) public static final WorldMapCacheName field325; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lat;" + descriptor = "Lat;" ) public static final WorldMapCacheName field324; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lat;" + descriptor = "Lat;" ) static final WorldMapCacheName field323; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lat;" + descriptor = "Lat;" ) public static final WorldMapCacheName field326; @ObfuscatedName("ga") @@ -60,7 +60,7 @@ public class WorldMapCacheName { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILlp;Lig;I)V", + descriptor = "(ILlp;Lig;I)V", garbageValue = "-1710341553" ) static void method688(int var0, ArchiveDisk var1, Archive var2) { diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index a4d83cb42b..848197e98b 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -8,13 +8,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapData_0 extends AbstractWorldMapData { @ObfuscatedName("dq") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive11") static Archive archive11; @ObfuscatedName("ej") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive19") static Archive archive19; @@ -24,7 +24,7 @@ public class WorldMapData_0 extends AbstractWorldMapData { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1154990112" ) @Export("init") @@ -46,7 +46,7 @@ public class WorldMapData_0 extends AbstractWorldMapData { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1774414997" ) @Export("readGeography") @@ -126,7 +126,7 @@ public class WorldMapData_0 extends AbstractWorldMapData { @ObfuscatedName("he") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "-992239935" ) static final void method243(int var0, int var1, int var2, int var3) { diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 3f15826d23..83daf1cad0 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -40,7 +40,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-484373567" ) @Export("init") @@ -66,7 +66,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)V", + descriptor = "(Lkn;I)V", garbageValue = "-1774414997" ) @Export("readGeography") @@ -100,7 +100,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "4" ) @Export("getChunkXLow") @@ -110,7 +110,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "259751183" ) @Export("getChunkYLow") @@ -120,7 +120,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-810164078" ) @Export("getChunkX") @@ -130,7 +130,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "196084572" ) @Export("getChunkY") @@ -157,7 +157,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "1959951733" ) public static boolean method784(int var0) { @@ -166,7 +166,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedName("im") @ObfuscatedSignature( - signature = "(IIIIB)V", + descriptor = "(IIIIB)V", garbageValue = "87" ) @Export("addSceneMenuOptions") @@ -179,64 +179,64 @@ public class WorldMapData_1 extends AbstractWorldMapData { long var6 = -1L; int var8; - for (var8 = 0; var8 < WorldMapSection2.method372(); ++var8) { - long var9 = WorldMapLabel.method482(var8); - if (var9 != var6) { - var6 = var9; - int var24 = SoundSystem.method2628(var8); - long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; - int var13 = (int)(var14 >>> 7 & 127L); - var13 = var13; - int var25 = class171.method3571(ViewportMouse.ViewportMouse_entityTags[var8]); - int var16 = class2.method32(var8); - if (var25 == 2 && UserComparator3.scene.getObjectFlags(TileItemPile.Client_plane, var24, var13, var9) >= 0) { - ObjectDefinition var17 = Canvas.getObjectDefinition(var16); - if (var17.transforms != null) { - var17 = var17.transform(); + for (var8 = 0; var8 < WorldMapSection2.getEntityCountUnderMouse(); ++var8) { + long entityTag_1 = WorldMapLabel.getEntityUnderMouse(var8); + if (entityTag_1 != var6) { + var6 = entityTag_1; + int sceneX = SoundSystem.getSceneXForObjectUnderMouse(var8); + long entityTag_2 = ViewportMouse.ViewportMouse_entityTags[var8]; + int sceneY = (int)(entityTag_2 >>> 7 & 0x7fL); + sceneY = sceneY; + int interactType = class171.Entity_unpackType(ViewportMouse.ViewportMouse_entityTags[var8]); + int objectId = class2.getEntityIdUnderMouse(var8); + if (interactType == 2 && UserComparator3.scene.getObjectFlags(TileItemPile.Client_plane, sceneX, sceneY, entityTag_1) >= 0) { + ObjectDefinition objectDef = Canvas.getObjectDefinition(objectId); + if (objectDef.transforms != null) { + objectDef = objectDef.transform(); } - if (var17 == null) { + if (objectDef == null) { continue; } if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + var17.name, 1, var16, var24, var13); + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + objectDef.name, 1, objectId, sceneX, sceneY); } else if (Client.isSpellSelected) { if ((WorldMapSprite.selectedSpellFlags & 4) == 4) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + var17.name, 2, var16, var24, var13); + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + objectDef.name, 2, objectId, sceneX, sceneY); } } else { - String[] var26 = var17.actions; - if (var26 != null) { - for (int var27 = 4; var27 >= 0; --var27) { - if (var26[var27] != null) { - short var20 = 0; - if (var27 == 0) { - var20 = 3; + String[] actions = objectDef.actions; + if (actions != null) { + for (int actionIdx = 4; actionIdx >= 0; --actionIdx) { + if (actions[actionIdx] != null) { + short opcode = 0; + if (actionIdx == 0) { + opcode = 3; } - if (var27 == 1) { - var20 = 4; + if (actionIdx == 1) { + opcode = 4; } - if (var27 == 2) { - var20 = 5; + if (actionIdx == 2) { + opcode = 5; } - if (var27 == 3) { - var20 = 6; + if (actionIdx == 3) { + opcode = 6; } - if (var27 == 4) { - var20 = 1001; + if (actionIdx == 4) { + opcode = 1001; } - ScriptEvent.insertMenuItemNoShift(var26[var27], ItemContainer.colorStartTag(65535) + var17.name, var20, var16, var24, var13); + ScriptEvent.insertMenuItemNoShift(actions[actionIdx], ItemContainer.colorStartTag(65535) + objectDef.name, opcode, objectId, sceneX, sceneY); } } } - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(65535) + var17.name, 1002, var17.id, var24, var13); + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(65535) + objectDef.name, 1002, objectDef.id, sceneX, sceneY); } } @@ -245,8 +245,8 @@ public class WorldMapData_1 extends AbstractWorldMapData { Player var21; int[] var33; int var35; - if (var25 == 1) { - NPC var30 = Client.npcs[var16]; + if (interactType == 1) { + NPC var30 = Client.npcs[objectId]; if (var30 == null) { continue; } @@ -255,7 +255,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { for (var18 = 0; var18 < Client.npcCount; ++var18) { var19 = Client.npcs[Client.npcIndices[var18]]; if (var19 != null && var30 != var19 && var19.definition.size == 1 && var19.x == var30.x && var19.y == var30.y) { - ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], var24, var13); + ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], sceneX, sceneY); } } @@ -265,16 +265,16 @@ public class WorldMapData_1 extends AbstractWorldMapData { for (var35 = 0; var35 < var18; ++var35) { var21 = Client.players[var33[var35]]; if (var21 != null && var30.x == var21.x && var30.y == var21.y) { - Player.addPlayerToMenu(var21, var33[var35], var24, var13); + Player.addPlayerToMenu(var21, var33[var35], sceneX, sceneY); } } } - ApproximateRouteStrategy.addNpcToMenu(var30.definition, var16, var24, var13); + ApproximateRouteStrategy.addNpcToMenu(var30.definition, objectId, sceneX, sceneY); } - if (var25 == 0) { - Player var31 = Client.players[var16]; + if (interactType == 0) { + Player var31 = Client.players[objectId]; if (var31 == null) { continue; } @@ -283,7 +283,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { for (var18 = 0; var18 < Client.npcCount; ++var18) { var19 = Client.npcs[Client.npcIndices[var18]]; if (var19 != null && var19.definition.size == 1 && var31.x == var19.x && var31.y == var19.y) { - ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], var24, var13); + ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], sceneX, sceneY); } } @@ -293,28 +293,28 @@ public class WorldMapData_1 extends AbstractWorldMapData { for (var35 = 0; var35 < var18; ++var35) { var21 = Client.players[var33[var35]]; if (var21 != null && var21 != var31 && var21.x == var31.x && var31.y == var21.y) { - Player.addPlayerToMenu(var21, var33[var35], var24, var13); + Player.addPlayerToMenu(var21, var33[var35], sceneX, sceneY); } } } - if (var16 != Client.combatTargetPlayerIndex) { - Player.addPlayerToMenu(var31, var16, var24, var13); + if (objectId != Client.combatTargetPlayerIndex) { + Player.addPlayerToMenu(var31, objectId, sceneX, sceneY); } else { - var4 = var9; + var4 = entityTag_1; } } - if (var25 == 3) { - NodeDeque var32 = Client.groundItems[TileItemPile.Client_plane][var24][var13]; + if (interactType == 3) { + NodeDeque var32 = Client.groundItems[TileItemPile.Client_plane][sceneX][sceneY]; if (var32 != null) { for (TileItem var36 = (TileItem)var32.first(); var36 != null; var36 = (TileItem)var32.next()) { ItemDefinition var34 = KitDefinition.ItemDefinition_get(var36.id); if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 16, var36.id, var24, var13); + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 16, var36.id, sceneX, sceneY); } else if (Client.isSpellSelected) { if ((WorldMapSprite.selectedSpellFlags & 1) == 1) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 17, var36.id, var24, var13); + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 17, var36.id, sceneX, sceneY); } } else { String[] var28 = var34.groundActions; @@ -342,13 +342,13 @@ public class WorldMapData_1 extends AbstractWorldMapData { var22 = 22; } - ScriptEvent.insertMenuItemNoShift(var28[var29], ItemContainer.colorStartTag(16748608) + var34.name, var22, var36.id, var24, var13); + ScriptEvent.insertMenuItemNoShift(var28[var29], ItemContainer.colorStartTag(16748608) + var34.name, var22, var36.id, sceneX, sceneY); } else if (var29 == 2) { - ScriptEvent.insertMenuItemNoShift("Take", ItemContainer.colorStartTag(16748608) + var34.name, 20, var36.id, var24, var13); + ScriptEvent.insertMenuItemNoShift("Take", ItemContainer.colorStartTag(16748608) + var34.name, 20, var36.id, sceneX, sceneY); } } - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + var34.name, 1004, var36.id, var24, var13); + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + var34.name, 1004, var36.id, sceneX, sceneY); } } } @@ -357,10 +357,10 @@ public class WorldMapData_1 extends AbstractWorldMapData { } if (-1L != var4) { - var8 = class279.method5159(var4); - int var23 = (int)(var4 >>> 7 & 127L); + var8 = class279.Entity_unpackSceneX(var4); + int pSceneY = (int)(var4 >>> 7 & 127L); Player var11 = Client.players[Client.combatTargetPlayerIndex]; - Player.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var23); + Player.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, pSceneY); } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 3c6d665972..88f66bd982 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -50,7 +50,7 @@ public class WorldMapDecoration { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SI)V", + descriptor = "([Ljava/lang/String;[SI)V", garbageValue = "478567291" ) public static void method400(String[] var0, short[] var1) { @@ -59,7 +59,7 @@ public class WorldMapDecoration { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "1441437585" ) public static int method402(int var0) { @@ -68,7 +68,7 @@ public class WorldMapDecoration { @ObfuscatedName("jl") @ObfuscatedSignature( - signature = "([Lhd;IB)V", + descriptor = "([Lhd;IB)V", garbageValue = "-69" ) @Export("drawModelComponents") diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 658a88d65a..0ff172de51 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -9,117 +9,117 @@ import net.runelite.mapping.ObfuscatedSignature; public enum WorldMapDecorationType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2756(0, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2757(1, 0), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2755(2, 0), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2758(3, 0), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2759(9, 2), @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2760(4, 1), @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2761(5, 1), @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2762(6, 1), @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2776(7, 1), @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2764(8, 1), @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2765(12, 2), @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2763(13, 2), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2769(14, 2), @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2768(15, 2), @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2766(16, 2), @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2770(17, 2), @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2771(18, 2), @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2772(19, 2), @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2767(20, 2), @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2774(21, 2), @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2775(10, 2), @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2778(11, 2), @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhp;" + descriptor = "Lhp;" ) field2777(22, 3); @@ -131,7 +131,7 @@ public enum WorldMapDecorationType implements Enumerated { public final int id; @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "0" ) WorldMapDecorationType(int var3, int var4) { @@ -140,7 +140,7 @@ public enum WorldMapDecorationType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 95951452c4..1c73d79f59 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapElement extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; @@ -21,13 +21,13 @@ public class WorldMapElement extends DualNode { public static int WorldMapElement_count; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lec;" + descriptor = "Lec;" ) @Export("WorldMapElement_cachedSprites") public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; @ObfuscatedName("hz") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("scrollBarSprites") static IndexedSprite[] scrollBarSprites; @@ -93,13 +93,13 @@ public class WorldMapElement extends DualNode { int field3255; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ljc;" + descriptor = "Ljc;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lif;" + descriptor = "Lif;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; @@ -135,7 +135,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "106" ) @Export("decode") @@ -152,7 +152,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkn;II)V", + descriptor = "(Lkn;II)V", garbageValue = "1696894212" ) @Export("decodeNext") @@ -239,7 +239,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "116" ) public void method4548() { @@ -263,7 +263,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ZI)Llz;", + descriptor = "(ZI)Llz;", garbageValue = "-314713437" ) @Export("getSpriteBool") @@ -274,7 +274,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Llz;", + descriptor = "(II)Llz;", garbageValue = "1760825025" ) @Export("getSprite") @@ -298,7 +298,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1240109519" ) @Export("getObjectId") @@ -308,7 +308,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;Llf;I)Llf;", + descriptor = "(Lkn;Llf;I)Llf;", garbageValue = "1394866461" ) @Export("readStringIntParameters") @@ -344,7 +344,7 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(ILhg;ZI)V", + descriptor = "(ILhg;ZI)V", garbageValue = "284772848" ) static void method4566(int var0, Coord var1, boolean var2) { diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index d42f222f8a..954833725e 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -26,19 +26,19 @@ public class WorldMapEvent { public int mapElement; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhg;" + descriptor = "Lhg;" ) @Export("coord1") public Coord coord1; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhg;" + descriptor = "Lhg;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - signature = "(ILhg;Lhg;)V" + descriptor = "(ILhg;Lhg;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -48,7 +48,7 @@ public class WorldMapEvent { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)J", + descriptor = "(I)J", garbageValue = "-33276510" ) static long method839() { @@ -84,7 +84,7 @@ public class WorldMapEvent { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lir;", + descriptor = "(II)Lir;", garbageValue = "-2114458170" ) @Export("KitDefinition_get") @@ -106,7 +106,7 @@ public class WorldMapEvent { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lig;IIIBZI)V", + descriptor = "(Lig;IIIBZI)V", garbageValue = "-966731754" ) @Export("requestNetFile") @@ -153,7 +153,7 @@ public class WorldMapEvent { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-1652034071" ) static int method836(int var0, Script var1, boolean var2) { @@ -516,7 +516,7 @@ public class WorldMapEvent { @ObfuscatedName("hg") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "823242837" ) static void method840(int var0, int var1) { diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 63540a61fa..c91e2e6c8a 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -9,12 +9,12 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapID { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lan;" + descriptor = "Lan;" ) static final WorldMapID field301; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lan;" + descriptor = "Lan;" ) static final WorldMapID field299; @ObfuscatedName("am") @@ -37,7 +37,7 @@ public class WorldMapID { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "-452075122" ) @Export("addChatMessage") @@ -56,16 +56,17 @@ public class WorldMapID { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-211582550" ) - public static int method617(int var0) { + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { return var0 >> 11 & 63; } @ObfuscatedName("gv") @ObfuscatedSignature( - signature = "(IIIIZI)V", + descriptor = "(IIIIZI)V", garbageValue = "-1973135066" ) @Export("setViewportShape") diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index dfb9100550..56ecb8d441 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -10,7 +10,7 @@ import net.runelite.rs.ScriptOpcodes; public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("sq") @ObfuscatedSignature( - signature = "Lr;" + descriptor = "Lr;" ) @Export("grandExchangeEvents") static GrandExchangeEvents grandExchangeEvents; @@ -22,7 +22,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { final int element; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lar;" + descriptor = "Lar;" ) @Export("label") final WorldMapLabel label; @@ -40,7 +40,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { final int subHeight; @ObfuscatedSignature( - signature = "(Lhg;Lhg;ILar;)V" + descriptor = "(Lhg;Lhg;ILar;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); @@ -60,7 +60,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "0" ) @Export("getElement") @@ -70,7 +70,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Lar;", + descriptor = "(B)Lar;", garbageValue = "35" ) @Export("getLabel") @@ -80,7 +80,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1804331962" ) @Export("getSubWidth") @@ -90,7 +90,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1265869629" ) @Export("getSubHeight") @@ -100,7 +100,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)[B", + descriptor = "(II)[B", garbageValue = "-116765930" ) @Export("ByteArrayPool_getArray") @@ -110,7 +110,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1354105347" ) static int method265(int var0, Script var1, boolean var2) { @@ -467,7 +467,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("gc") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-63078339" ) @Export("addNpcsToScene") @@ -497,7 +497,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("it") @ObfuscatedSignature( - signature = "([Lhd;Lhd;ZS)V", + descriptor = "([Lhd;Lhd;ZS)V", garbageValue = "-3141" ) @Export("revalidateWidgetScroll") diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 460dbaab2f..819956398d 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -10,12 +10,12 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) static IndexedSprite field206; @ObfuscatedName("dj") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive14") static Archive archive14; @@ -27,7 +27,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { final int objectDefId; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lap;" + descriptor = "Lap;" ) @Export("region") final WorldMapRegion region; @@ -39,7 +39,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { int element; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lar;" + descriptor = "Lar;" ) @Export("label") WorldMapLabel label; @@ -57,7 +57,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { int subHeight; @ObfuscatedSignature( - signature = "(Lhg;Lhg;ILap;)V" + descriptor = "(Lhg;Lhg;ILap;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -68,7 +68,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "0" ) @Export("getElement") @@ -78,7 +78,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Lar;", + descriptor = "(B)Lar;", garbageValue = "35" ) @Export("getLabel") @@ -88,7 +88,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1804331962" ) @Export("getSubWidth") @@ -98,7 +98,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-1265869629" ) @Export("getSubHeight") @@ -108,7 +108,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "19136800" ) @Export("init") @@ -129,7 +129,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Ljava/security/SecureRandom;", + descriptor = "(I)Ljava/security/SecureRandom;", garbageValue = "1486718795" ) static SecureRandom method348() { @@ -140,7 +140,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIIIIIIILem;[Lfz;I)V", + descriptor = "([BIIIIIIILem;[Lfz;I)V", garbageValue = "1704898412" ) static final void method365(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 095a2aacfe..732a7317af 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -17,13 +17,13 @@ public class WorldMapLabel { static byte[][][] field269; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("Widget_fontsArchive") static AbstractArchive Widget_fontsArchive; @ObfuscatedName("ek") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive15") static Archive archive15; @@ -35,7 +35,7 @@ public class WorldMapLabel { static int port3; @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "Lko;" + descriptor = "Lko;" ) @Export("fontPlain11") static Font fontPlain11; @@ -56,13 +56,13 @@ public class WorldMapLabel { int height; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lah;" + descriptor = "Lah;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILah;)V" + descriptor = "(Ljava/lang/String;IILah;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -73,16 +73,17 @@ public class WorldMapLabel { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "578317705" ) - public static boolean method487(int var0) { + @Export("Widget_hasContinueOption") + public static boolean Widget_hasContinueOption(int var0) { return (var0 & 1) != 0; } @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lbu;II)V", + descriptor = "(Lbu;II)V", garbageValue = "1472646677" ) @Export("runScript") @@ -399,16 +400,17 @@ public class WorldMapLabel { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IB)J", + descriptor = "(IB)J", garbageValue = "88" ) - public static long method482(int var0) { + @Export("getEntityUnderMouse") + public static long getEntityUnderMouse(int var0) { return ViewportMouse.ViewportMouse_entityTags[var0]; } @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "807704553" ) @Export("Messages_getLastChatID") @@ -423,7 +425,7 @@ public class WorldMapLabel { @ObfuscatedName("ff") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1944038316" ) static final void method488() { @@ -539,7 +541,7 @@ public class WorldMapLabel { @ObfuscatedName("il") @ObfuscatedSignature( - signature = "(Lhd;III)V", + descriptor = "(Lhd;III)V", garbageValue = "-488696963" ) @Export("alignWidgetPosition") @@ -576,7 +578,7 @@ public class WorldMapLabel { @ObfuscatedName("jv") @ObfuscatedSignature( - signature = "(IIII)Lbz;", + descriptor = "(IIII)Lbz;", garbageValue = "1553809797" ) static final InterfaceParent method486(int var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 9356fd0246..b43e0e0bed 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -9,19 +9,19 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapLabelSize { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lah;" + descriptor = "Lah;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lah;" + descriptor = "Lah;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lah;" + descriptor = "Lah;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; @@ -32,7 +32,7 @@ public class WorldMapLabelSize { static int field134; @ObfuscatedName("fw") @ObfuscatedSignature( - signature = "Leh;" + descriptor = "Leh;" ) @Export("urlRequester") static UrlRequester urlRequester; @@ -66,7 +66,7 @@ public class WorldMapLabelSize { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(FI)Z", + descriptor = "(FI)Z", garbageValue = "-645861568" ) boolean method246(float var1) { @@ -75,7 +75,7 @@ public class WorldMapLabelSize { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Lhd;", + descriptor = "(III)Lhd;", garbageValue = "-756668004" ) @Export("getWidgetChild") @@ -90,7 +90,7 @@ public class WorldMapLabelSize { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1950669116" ) public static boolean method251() { @@ -99,7 +99,7 @@ public class WorldMapLabelSize { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1407102588" ) static final void method249() { @@ -110,7 +110,7 @@ public class WorldMapLabelSize { @ObfuscatedName("kw") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2140827250" ) static void method247() { diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 08a5f4ee6d..71c265c1d0 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -26,13 +26,13 @@ public final class WorldMapManager { boolean loadStarted; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Laz;" + descriptor = "Laz;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; @@ -41,7 +41,7 @@ public final class WorldMapManager { HashMap icons; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[[Lap;" + descriptor = "[[Lap;" ) @Export("regions") WorldMapRegion[][] regions; @@ -50,19 +50,19 @@ public final class WorldMapManager { HashMap scaleHandlers; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("groundArchive") final AbstractArchive groundArchive; @@ -101,7 +101,7 @@ public final class WorldMapManager { public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Llh;Ljava/util/HashMap;Lic;Lic;)V" + descriptor = "([Llh;Ljava/util/HashMap;Lic;Lic;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; @@ -116,7 +116,7 @@ public final class WorldMapManager { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Ljava/lang/String;ZI)V", + descriptor = "(Lic;Ljava/lang/String;ZI)V", garbageValue = "2141843540" ) @Export("load") @@ -189,7 +189,7 @@ public final class WorldMapManager { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1532053467" ) @Export("clearIcons") @@ -199,7 +199,7 @@ public final class WorldMapManager { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIIIIII)V", + descriptor = "(IIIIIIIII)V", garbageValue = "-2041483003" ) @Export("drawTiles") @@ -246,7 +246,7 @@ public final class WorldMapManager { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", + descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", garbageValue = "531249052" ) @Export("drawElements") @@ -281,7 +281,7 @@ public final class WorldMapManager { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIILjava/util/HashSet;IIB)V", + descriptor = "(IIIILjava/util/HashSet;IIB)V", garbageValue = "-52" ) @Export("drawOverview") @@ -321,7 +321,7 @@ public final class WorldMapManager { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIIIIIIIIIB)Ljava/util/List;", + descriptor = "(IIIIIIIIIIB)Ljava/util/List;", garbageValue = "7" ) public List method695(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { @@ -350,7 +350,7 @@ public final class WorldMapManager { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIII)Lag;", + descriptor = "(IIIII)Lag;", garbageValue = "-1190093558" ) @Export("createWorldMapRectangle") @@ -393,7 +393,7 @@ public final class WorldMapManager { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "0" ) @Export("isLoaded") @@ -403,7 +403,7 @@ public final class WorldMapManager { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Ljava/util/HashMap;", + descriptor = "(I)Ljava/util/HashMap;", garbageValue = "-518296380" ) @Export("buildIcons") @@ -414,7 +414,7 @@ public final class WorldMapManager { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-84" ) @Export("buildIcons0") @@ -451,7 +451,7 @@ public final class WorldMapManager { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIB)F", + descriptor = "(IIB)F", garbageValue = "-11" ) @Export("getPixelsPerTile") @@ -469,7 +469,7 @@ public final class WorldMapManager { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1960710050" ) @Export("isKeyDown") @@ -488,13 +488,13 @@ public final class WorldMapManager { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILcs;ZB)I", + descriptor = "(ILcs;ZB)I", garbageValue = "-25" ) static int method717(int var0, Script var1, boolean var2) { Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.method617(KeyHandler.getWidgetClickMask(var3)); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var3)); return 1; } else if (var0 != ScriptOpcodes.IF_GETOP) { if (var0 == ScriptOpcodes.IF_GETOPBASE) { diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 2062f1da14..33f760caa6 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -11,7 +11,7 @@ public final class WorldMapRectangle { static int[] field198; @ObfuscatedName("de") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive5") static Archive archive5; @@ -47,12 +47,12 @@ public final class WorldMapRectangle { int y; // $FF: synthetic field @ObfuscatedSignature( - signature = "Laa;" + descriptor = "Laa;" ) final WorldMapManager this$0; @ObfuscatedSignature( - signature = "(Laa;)V" + descriptor = "(Laa;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; @@ -60,7 +60,7 @@ public final class WorldMapRectangle { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-429068240" ) public static int method347(int var0, int var1) { @@ -70,7 +70,7 @@ public final class WorldMapRectangle { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-349989095" ) @Export("Login_promptCredentials") @@ -97,7 +97,7 @@ public final class WorldMapRectangle { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lhd;IIII)V", + descriptor = "(Lhd;IIII)V", garbageValue = "-127200615" ) @Export("Widget_setKeyRate") @@ -112,7 +112,7 @@ public final class WorldMapRectangle { @ObfuscatedName("ji") @ObfuscatedSignature( - signature = "(IIIILlz;Lhh;I)V", + descriptor = "(IIIILlz;Lhh;I)V", garbageValue = "866321883" ) @Export("worldToMinimap") diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 36809a32dd..6d58711719 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -15,7 +15,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapRegion { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lfr;" + descriptor = "Lfr;" ) @Export("WorldMapRegion_cachedSprites") static DemotingHashTable WorldMapRegion_cachedSprites; @@ -33,7 +33,7 @@ public class WorldMapRegion { int regionY; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Li;" + descriptor = "Li;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; @@ -78,7 +78,7 @@ public class WorldMapRegion { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)V", + descriptor = "(IIII)V", garbageValue = "-323473463" ) void method490(int var1, int var2, int var3) { @@ -95,7 +95,7 @@ public class WorldMapRegion { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Li;Ljava/util/List;I)V", + descriptor = "(Li;Ljava/util/List;I)V", garbageValue = "-1392873276" ) @Export("initWorldMapData0") @@ -107,7 +107,7 @@ public class WorldMapRegion { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;Ljava/util/List;B)V", + descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", garbageValue = "114" ) @Export("initWorldMapData1") @@ -127,7 +127,7 @@ public class WorldMapRegion { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIILax;I)V", + descriptor = "(IIIILax;I)V", garbageValue = "513799457" ) @Export("getIconsForTiles") @@ -157,7 +157,7 @@ public class WorldMapRegion { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljg;IIILax;I)V", + descriptor = "(Ljg;IIILax;I)V", garbageValue = "1752488167" ) @Export("getIcon") @@ -184,7 +184,7 @@ public class WorldMapRegion { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1939037740" ) @Export("initWorldMapIcon1s") @@ -202,7 +202,7 @@ public class WorldMapRegion { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljava/util/List;I)V", + descriptor = "(Ljava/util/List;I)V", garbageValue = "-1366696532" ) @Export("addAllToIconList") @@ -221,7 +221,7 @@ public class WorldMapRegion { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1391400259" ) void method580() { @@ -240,7 +240,7 @@ public class WorldMapRegion { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lic;I)Z", + descriptor = "(Lic;I)Z", garbageValue = "-1165934913" ) @Export("loadGeography") @@ -279,7 +279,7 @@ public class WorldMapRegion { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILay;[Llh;Lic;Lic;I)V", + descriptor = "(ILay;[Llh;Lic;Lic;I)V", garbageValue = "-799383237" ) @Export("drawTile") @@ -323,7 +323,7 @@ public class WorldMapRegion { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIILjava/util/HashSet;I)V", + descriptor = "(IIILjava/util/HashSet;I)V", garbageValue = "830003997" ) void method514(int var1, int var2, int var3, HashSet var4) { @@ -337,7 +337,7 @@ public class WorldMapRegion { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;III)V", + descriptor = "(Ljava/util/HashSet;III)V", garbageValue = "-850649722" ) @Export("flashElements") @@ -360,7 +360,7 @@ public class WorldMapRegion { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lay;[Llh;Las;B)V", + descriptor = "(Lay;[Llh;Las;B)V", garbageValue = "-41" ) void method501(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { @@ -383,7 +383,7 @@ public class WorldMapRegion { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lay;[Llh;Las;B)V", + descriptor = "(Lay;[Llh;Las;B)V", garbageValue = "-26" ) void method502(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { @@ -419,7 +419,7 @@ public class WorldMapRegion { @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IILax;Lay;[Llh;I)V", + descriptor = "(IILax;Lay;[Llh;I)V", garbageValue = "-248826960" ) void method503(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { @@ -429,7 +429,7 @@ public class WorldMapRegion { @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IILax;Lay;Las;I)V", + descriptor = "(IILax;Lay;Las;I)V", garbageValue = "1979978658" ) @Export("drawTileGround") @@ -459,7 +459,7 @@ public class WorldMapRegion { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IILax;Lay;I)V", + descriptor = "(IILax;Lay;I)V", garbageValue = "-946989025" ) void method511(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { @@ -479,7 +479,7 @@ public class WorldMapRegion { @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IILax;Las;B)I", + descriptor = "(IILax;Las;B)I", garbageValue = "76" ) int method506(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { @@ -488,7 +488,7 @@ public class WorldMapRegion { @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IILax;[Llh;I)V", + descriptor = "(IILax;[Llh;I)V", garbageValue = "-388606552" ) void method507(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { @@ -523,7 +523,7 @@ public class WorldMapRegion { @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IILax;B)V", + descriptor = "(IILax;B)V", garbageValue = "101" ) void method527(int var1, int var2, AbstractWorldMapData var3) { @@ -588,7 +588,7 @@ public class WorldMapRegion { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(IILjava/util/HashSet;II)V", + descriptor = "(IILjava/util/HashSet;II)V", garbageValue = "-1066971556" ) @Export("drawNonLinkMapIcons") @@ -617,7 +617,7 @@ public class WorldMapRegion { @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;III)V", + descriptor = "(Ljava/util/HashSet;III)V", garbageValue = "-545046717" ) void method497(HashSet var1, int var2, int var3) { @@ -637,7 +637,7 @@ public class WorldMapRegion { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Lih;IIIII)V", + descriptor = "(Lih;IIIII)V", garbageValue = "1074456567" ) @Export("drawBackgroundCircle") @@ -655,7 +655,7 @@ public class WorldMapRegion { @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Laf;IIFI)V", + descriptor = "(Laf;IIFI)V", garbageValue = "-591534558" ) void method512(AbstractWorldMapIcon var1, int var2, int var3, float var4) { @@ -666,7 +666,7 @@ public class WorldMapRegion { @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Lih;IIB)V", + descriptor = "(Lih;IIB)V", garbageValue = "34" ) void method494(WorldMapElement var1, int var2, int var3) { @@ -681,7 +681,7 @@ public class WorldMapRegion { @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Laf;Lih;IIFB)V", + descriptor = "(Laf;Lih;IIFB)V", garbageValue = "81" ) void method604(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { @@ -696,7 +696,7 @@ public class WorldMapRegion { @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(IILjava/util/HashSet;II)V", + descriptor = "(IILjava/util/HashSet;II)V", garbageValue = "-109418068" ) @Export("drawMapLinks") @@ -721,7 +721,7 @@ public class WorldMapRegion { @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Llz;Ljc;I)I", + descriptor = "(Llz;Ljc;I)I", garbageValue = "-1624159662" ) int method516(Sprite var1, HorizontalAlignment var2) { @@ -737,7 +737,7 @@ public class WorldMapRegion { @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Llz;Lif;I)I", + descriptor = "(Llz;Lif;I)I", garbageValue = "1330408949" ) int method517(Sprite var1, VerticalAlignment var2) { @@ -753,7 +753,7 @@ public class WorldMapRegion { @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(IB)Lar;", + descriptor = "(IB)Lar;", garbageValue = "15" ) WorldMapLabel method518(int var1) { @@ -763,7 +763,7 @@ public class WorldMapRegion { @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Lih;I)Lar;", + descriptor = "(Lih;I)Lar;", garbageValue = "-1165001445" ) @Export("createMapLabel") @@ -822,7 +822,7 @@ public class WorldMapRegion { @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IIIIII)Ljava/util/List;", + descriptor = "(IIIIII)Ljava/util/List;", garbageValue = "1872285307" ) List method544(int var1, int var2, int var3, int var4, int var5) { @@ -859,7 +859,7 @@ public class WorldMapRegion { @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(I)Ljava/util/List;", + descriptor = "(I)Ljava/util/List;", garbageValue = "-2023703181" ) @Export("icons") @@ -872,7 +872,7 @@ public class WorldMapRegion { @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "-637196231" ) void method522(int var1, int var2, int var3, int var4) { @@ -897,7 +897,7 @@ public class WorldMapRegion { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", + descriptor = "(IB)Ljava/lang/String;", garbageValue = "0" ) static String method611(int var0) { @@ -906,7 +906,7 @@ public class WorldMapRegion { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lic;Lic;ZIB)V", + descriptor = "(Lic;Lic;ZIB)V", garbageValue = "73" ) static void method541(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { @@ -974,7 +974,7 @@ public class WorldMapRegion { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIILem;[Lfz;I)V", + descriptor = "([BIILem;[Lfz;I)V", garbageValue = "2110608618" ) static final void method520(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { @@ -1024,7 +1024,7 @@ public class WorldMapRegion { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", garbageValue = "1188982051" ) public static String method613(CharSequence var0) { @@ -1041,7 +1041,7 @@ public class WorldMapRegion { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1729353044" ) static void method591() { diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 22fbbdcbad..dbbdb22e67 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -26,7 +26,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIIIIIII)V", + descriptor = "(IIIIIIIII)V", garbageValue = "1923645128" ) void method798(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -39,7 +39,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-1887787405" ) int method794(int var1, int var2) { @@ -60,7 +60,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-1636996123" ) int method795(int var1) { @@ -73,7 +73,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1385757357" ) @Export("init") @@ -93,7 +93,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1289637080" ) @Export("init0") @@ -160,7 +160,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-112" ) @Export("init1") @@ -231,7 +231,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1821713225" ) @Export("init2") @@ -298,7 +298,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-294529084" ) @Export("init3") @@ -365,7 +365,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1871993011" ) @Export("init4") @@ -432,7 +432,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "13" ) @Export("init5") @@ -501,7 +501,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-437355569" ) @Export("init6") @@ -570,7 +570,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "959686276" ) @Export("init7") @@ -639,7 +639,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IS)Z", + descriptor = "(IS)Z", garbageValue = "180" ) public static boolean method819(int var0) { @@ -648,7 +648,7 @@ public class WorldMapScaleHandler { @ObfuscatedName("gq") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1963467605" ) static void method812() { diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 567a46271a..0c794f72dc 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "411670415" ) @Export("expandBounds") @@ -16,7 +16,7 @@ public interface WorldMapSection { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)Z", + descriptor = "(IIIB)Z", garbageValue = "2" ) @Export("containsCoord") @@ -24,7 +24,7 @@ public interface WorldMapSection { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "48" ) @Export("containsPosition") @@ -32,7 +32,7 @@ public interface WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)[I", + descriptor = "(IIII)[I", garbageValue = "459340529" ) @Export("getBorderTileLengths") @@ -40,7 +40,7 @@ public interface WorldMapSection { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhg;", + descriptor = "(III)Lhg;", garbageValue = "1240901536" ) @Export("coord") @@ -48,7 +48,7 @@ public interface WorldMapSection { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "0" ) @Export("read") diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index ecdbfae0f5..1d00b442c4 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("fa") @ObfuscatedSignature( - signature = "Lkv;" + descriptor = "Lkv;" ) @Export("WorldMapElement_fonts") static Fonts WorldMapElement_fonts; @@ -103,7 +103,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "411670415" ) @Export("expandBounds") @@ -128,7 +128,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)Z", + descriptor = "(IIIB)Z", garbageValue = "2" ) @Export("containsCoord") @@ -142,7 +142,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "48" ) @Export("containsPosition") @@ -152,7 +152,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)[I", + descriptor = "(IIII)[I", garbageValue = "459340529" ) @Export("getBorderTileLengths") @@ -167,7 +167,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhg;", + descriptor = "(III)Lhg;", garbageValue = "1240901536" ) @Export("coord") @@ -183,7 +183,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "0" ) @Export("read") @@ -207,7 +207,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1040528661" ) @Export("postRead") @@ -216,7 +216,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lcs;", + descriptor = "(II)Lcs;", garbageValue = "1805062826" ) @Export("getScript") @@ -238,7 +238,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1742384999" ) public static final void method299() { @@ -248,7 +248,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(IB)I", + descriptor = "(IB)I", garbageValue = "50" ) static int method295(int var0) { @@ -257,7 +257,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("hd") @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", garbageValue = "89" ) @Export("menuAction") @@ -613,9 +613,9 @@ public class WorldMapSection0 implements WorldMapSection { var16 = WorldMapLabelSize.getWidgetChild(var1, var0); if (var16 != null) { GrandExchangeOffer.Widget_runOnTargetLeave(); - AttackOption.selectSpell(var1, var0, WorldMapID.method617(KeyHandler.getWidgetClickMask(var16)), var16.itemId); + AttackOption.selectSpell(var1, var0, WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var16)), var16.itemId); Client.isItemSelected = 0; - Client.selectedSpellActionName = WorldMapAreaData.method762(var16); + Client.selectedSpellActionName = WorldMapAreaData.Widget_getSpellActionName(var16); if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; } @@ -1036,7 +1036,7 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedName("ju") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-2103133941" ) @Export("changeGameOptions") diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index aa1dc581ee..d841fc93df 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("lg") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) @Export("mousedOverWidgetIf1") static Widget mousedOverWidgetIf1; @@ -55,7 +55,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "411670415" ) @Export("expandBounds") @@ -80,7 +80,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)Z", + descriptor = "(IIIB)Z", garbageValue = "2" ) @Export("containsCoord") @@ -94,7 +94,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "48" ) @Export("containsPosition") @@ -104,7 +104,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)[I", + descriptor = "(IIII)[I", garbageValue = "459340529" ) @Export("getBorderTileLengths") @@ -119,7 +119,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhg;", + descriptor = "(III)Lhg;", garbageValue = "1240901536" ) @Export("coord") @@ -135,7 +135,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "0" ) @Export("read") @@ -151,7 +151,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-123" ) @Export("postRead") @@ -160,7 +160,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;Ljava/lang/String;Ljava/lang/String;IZI)V", + descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;IZI)V", garbageValue = "-1968156146" ) public static void method656(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { @@ -171,7 +171,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IZIZI)V", + descriptor = "(IZIZI)V", garbageValue = "1727413002" ) @Export("sortWorldList") @@ -184,7 +184,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1443767280" ) static final void method655(String var0) { @@ -196,7 +196,7 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedName("jt") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "23" ) static void method648(int var0) { diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 37a8d7fa78..e59fceb9b3 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -69,7 +69,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "411670415" ) @Export("expandBounds") @@ -94,7 +94,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)Z", + descriptor = "(IIIB)Z", garbageValue = "2" ) @Export("containsCoord") @@ -108,7 +108,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "48" ) @Export("containsPosition") @@ -118,7 +118,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)[I", + descriptor = "(IIII)[I", garbageValue = "459340529" ) @Export("getBorderTileLengths") @@ -133,7 +133,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhg;", + descriptor = "(III)Lhg;", garbageValue = "1240901536" ) @Export("coord") @@ -149,7 +149,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "0" ) @Export("read") @@ -169,7 +169,7 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(S)V", + descriptor = "(S)V", garbageValue = "4206" ) @Export("postRead") @@ -178,16 +178,17 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-2012901203" ) - public static int method372() { + @Export("getEntityCountUnderMouse") + public static int getEntityCountUnderMouse() { return ViewportMouse.ViewportMouse_entityCount; } @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "926990190" ) static void method398() { diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 1c6fe5c0e1..0f91c12291 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -10,7 +10,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lau;" + descriptor = "Lau;" ) @Export("worldMapEvent") static WorldMapEvent worldMapEvent; @@ -76,7 +76,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lad;I)V", + descriptor = "(Lad;I)V", garbageValue = "411670415" ) @Export("expandBounds") @@ -101,7 +101,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIB)Z", + descriptor = "(IIIB)Z", garbageValue = "2" ) @Export("containsCoord") @@ -115,7 +115,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)Z", + descriptor = "(IIB)Z", garbageValue = "48" ) @Export("containsPosition") @@ -125,7 +125,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)[I", + descriptor = "(IIII)[I", garbageValue = "459340529" ) @Export("getBorderTileLengths") @@ -140,7 +140,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhg;", + descriptor = "(III)Lhg;", garbageValue = "1240901536" ) @Export("coord") @@ -156,7 +156,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkn;B)V", + descriptor = "(Lkn;B)V", garbageValue = "0" ) @Export("read") @@ -176,7 +176,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1212353754" ) void method842() { @@ -184,7 +184,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Z", + descriptor = "(B)Z", garbageValue = "26" ) @Export("loadWorlds") @@ -224,7 +224,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-672116026" ) @Export("iLog") @@ -260,7 +260,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("ec") @ObfuscatedSignature( - signature = "(IZZZB)Lig;", + descriptor = "(IZZZB)Lig;", garbageValue = "34" ) @Export("newArchive") @@ -275,7 +275,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("hy") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-32" ) static final void method841() { @@ -316,7 +316,7 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedName("jn") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "32" ) @Export("Widget_resetModelFrames") diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 6b8d08f66c..f3312983d5 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -9,25 +9,25 @@ import net.runelite.mapping.ObfuscatedSignature; public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lae;" + descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE0") WORLDMAPSECTIONTYPE0(3, (byte)0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lae;" + descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE1") WORLDMAPSECTIONTYPE1(0, (byte)1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lae;" + descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(2, (byte)2), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lae;" + descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(1, (byte)3); @@ -35,7 +35,7 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("au") @Export("client") @ObfuscatedSignature( - signature = "Lclient;" + descriptor = "Lclient;" ) static Client client; @ObfuscatedName("ew") @@ -66,7 +66,7 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -76,7 +76,7 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", + descriptor = "(Ljava/lang/String;ZZI)V", garbageValue = "267980652" ) @Export("openURL") @@ -86,7 +86,7 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILic;Ljava/lang/String;Ljava/lang/String;IZI)V", + descriptor = "(ILic;Ljava/lang/String;Ljava/lang/String;IZI)V", garbageValue = "-2120164920" ) public static void method306(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { @@ -97,7 +97,7 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-230874976" ) public static void method312() { diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 9e4e09698c..cb5124c7f6 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class WorldMapSprite { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgw;" + descriptor = "Lgw;" ) @Export("midiPcmStream") public static MidiPcmStream midiPcmStream; @@ -48,7 +48,7 @@ public final class WorldMapSprite { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "2081761027" ) @Export("getTileColor") @@ -58,7 +58,7 @@ public final class WorldMapSprite { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)Lhd;", + descriptor = "(IB)Lhd;", garbageValue = "115" ) @Export("getWidget") @@ -77,7 +77,7 @@ public final class WorldMapSprite { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "2146534283" ) @Export("itemContainerSetItem") @@ -113,7 +113,7 @@ public final class WorldMapSprite { @ObfuscatedName("ep") @ObfuscatedSignature( - signature = "(Lig;Ljava/lang/String;I)V", + descriptor = "(Lig;Ljava/lang/String;I)V", garbageValue = "2099603799" ) static void method481(Archive var0, String var1) { @@ -124,7 +124,7 @@ public final class WorldMapSprite { @ObfuscatedName("jk") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1835863543" ) @Export("FriendSystem_invalidateIgnoreds") diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index ce37fa0c33..3dadadc0d9 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -5,14 +5,14 @@ import net.runelite.mapping.ObfuscatedSignature; public interface class0 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkn;B)V", + descriptor = "(Ljava/lang/Object;Lkn;B)V", garbageValue = "0" ) void vmethod59(Object var1, Buffer var2); @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)Ljava/lang/Object;", + descriptor = "(Lkn;B)Ljava/lang/Object;", garbageValue = "114" ) Object vmethod47(Buffer var1); diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 6146089834..1f7607d7e3 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -10,7 +10,7 @@ final class class1 implements class0 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkn;B)V", + descriptor = "(Ljava/lang/Object;Lkn;B)V", garbageValue = "0" ) public void vmethod59(Object var1, Buffer var2) { @@ -19,7 +19,7 @@ final class class1 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)Ljava/lang/Object;", + descriptor = "(Lkn;B)Ljava/lang/Object;", garbageValue = "114" ) public Object vmethod47(Buffer var1) { @@ -28,7 +28,7 @@ final class class1 implements class0 { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lkn;I)V", + descriptor = "(Ljava/lang/Integer;Lkn;I)V", garbageValue = "554078910" ) void method8(Integer var1, Buffer var2) { @@ -37,7 +37,7 @@ final class class1 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmr;" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmr;" ) @Export("newRunException") public static RunException newRunException(Throwable var0, String var1) { @@ -54,7 +54,7 @@ final class class1 implements class0 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "-345681310" ) static void method16(int var0, int var1, int var2, int var3) { @@ -132,7 +132,7 @@ final class class1 implements class0 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(CLgz;I)I", + descriptor = "(CLgz;I)I", garbageValue = "393583355" ) @Export("lowercaseChar") @@ -152,7 +152,7 @@ final class class1 implements class0 { @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", + descriptor = "(B)I", garbageValue = "25" ) static final int method17() { @@ -161,7 +161,7 @@ final class class1 implements class0 { @ObfuscatedName("fo") @ObfuscatedSignature( - signature = "(Lhd;III)V", + descriptor = "(Lhd;III)V", garbageValue = "45098661" ) @Export("checkIfMinimapClicked") @@ -211,7 +211,7 @@ final class class1 implements class0 { @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "(IIIIIIII)V", + descriptor = "(IIIIIIII)V", garbageValue = "1438850851" ) @Export("addPendingSpawnToScene") @@ -507,7 +507,7 @@ final class class1 implements class0 { @ObfuscatedName("hn") @ObfuscatedSignature( - signature = "(IIIII)V", + descriptor = "(IIIII)V", garbageValue = "-569208973" ) static final void method7(int var0, int var1, int var2, int var3) { diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index a545b65925..3e9bc8a24d 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -11,7 +11,7 @@ public class class10 { final String field46; @ObfuscatedSignature( - signature = "(Lkn;)V" + descriptor = "(Lkn;)V" ) class10(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index 9aebd6bb74..e922c69f89 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -6,13 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class class105 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljx;" + descriptor = "Ljx;" ) @Export("reflectionChecks") static IterableNodeDeque reflectionChecks; @ObfuscatedName("dn") @ObfuscatedSignature( - signature = "Lig;" + descriptor = "Lig;" ) @Export("archive3") static Archive archive3; @@ -23,7 +23,7 @@ public class class105 { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "1577025565" ) static final int method2414(int var0, int var1) { diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 3ee970c576..c41813a2f2 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public interface class12 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;)Lkn;" + descriptor = "(Lkn;)Lkn;" ) Buffer vmethod133(Buffer var1); } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 9a40159619..2438315de1 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -6,19 +6,19 @@ import net.runelite.mapping.ObfuscatedSignature; public final class class13 { @ObfuscatedName("sz") @ObfuscatedSignature( - signature = "Lmc;" + descriptor = "Lmc;" ) @Export("platformInfo") static PlatformInfo platformInfo; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lch;" + descriptor = "[Lch;" ) @Export("World_worlds") static World[] World_worlds; @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) @Export("worldSelectLeftSprite") static IndexedSprite worldSelectLeftSprite; diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index 4eca7656c3..a218fbcb38 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -7,22 +7,22 @@ import net.runelite.mapping.ObfuscatedSignature; public enum class169 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfg;" + descriptor = "Lfg;" ) field2028(0, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lfg;" + descriptor = "Lfg;" ) field2023(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lfg;" + descriptor = "Lfg;" ) field2024(2, 2), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfg;" + descriptor = "Lfg;" ) field2025(3, 3); @@ -31,7 +31,7 @@ public enum class169 implements Enumerated { static String worldHost; @ObfuscatedName("lz") @ObfuscatedSignature( - signature = "Lcu;" + descriptor = "Lcu;" ) @Export("tempMenuAction") static MenuAction tempMenuAction; @@ -54,7 +54,7 @@ public enum class169 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 72aed82be1..6ee50d8d9c 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -8,13 +8,14 @@ public class class171 implements class170 { static byte[][][] field2036; @ObfuscatedName("g") - public static int method3571(long var0) { + @Export("Entity_unpackType") + public static int Entity_unpackType(long var0) { return (int)(var0 >>> 14 & 3L); } @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)I", + descriptor = "(II)I", garbageValue = "-316130396" ) @Export("Messages_getNextChatID") diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 9bb2daf6ac..9406341682 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -5,57 +5,57 @@ import net.runelite.mapping.ObfuscatedSignature; public class class194 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2357; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2354; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2355; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2358; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2353; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2360; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2359; @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2363; @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2361; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgl;" + descriptor = "Lgl;" ) public static final class194 field2362; @ObfuscatedName("jp") @ObfuscatedSignature( - signature = "Lhd;" + descriptor = "Lhd;" ) static Widget field2356; @@ -73,7 +73,7 @@ public class class194 { } @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "6" ) class194(int var1) { diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index f34175eeb7..b58230d545 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -6,14 +6,14 @@ import net.runelite.mapping.ObfuscatedSignature; public class class195 { @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "Lmo;" + descriptor = "Lmo;" ) @Export("loginType") static LoginType loginType; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([BI)[B", + descriptor = "([BI)[B", garbageValue = "-92628097" ) static byte[] method3748(byte[] var0) { @@ -25,7 +25,7 @@ public class class195 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIILjg;IB)V", + descriptor = "(IIILjg;IB)V", garbageValue = "-24" ) static void method3747(int var0, int var1, int var2, ObjectDefinition var3, int var4) { @@ -61,7 +61,7 @@ public class class195 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1529350789" ) public static void method3749() { diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index d8a09e15f3..f9497dfa16 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class197 { @ObfuscatedName("qy") @ObfuscatedSignature( - signature = "Ldv;" + descriptor = "Ldv;" ) @Export("decimator") static Decimator decimator; @@ -30,7 +30,7 @@ public class class197 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", garbageValue = "-1357689499" ) @Export("RunException_sendStackTrace") @@ -73,7 +73,7 @@ public class class197 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;I)V", + descriptor = "(Lic;I)V", garbageValue = "-1399485116" ) public static void method3771(AbstractArchive var0) { diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index 2faff3ce0e..7f01efeb95 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -6,17 +6,18 @@ import net.runelite.mapping.ObfuscatedSignature; public class class198 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("ParamDefinition_archive") static AbstractArchive ParamDefinition_archive; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IB)Z", + descriptor = "(IB)Z", garbageValue = "-100" ) - public static boolean method3774(int var0) { + @Export("Widget_containerHasUseOption") + public static boolean Widget_containerHasUseOption(int var0) { return (var0 >> 31 & 1) != 0; } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index d4882636a6..d311fcf7c8 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -6,14 +6,14 @@ import net.runelite.mapping.ObfuscatedSignature; final class class2 implements class0 { @ObfuscatedName("qo") @ObfuscatedSignature( - signature = "Ldt;" + descriptor = "Ldt;" ) @Export("pcmPlayer0") static PcmPlayer pcmPlayer0; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkn;B)V", + descriptor = "(Ljava/lang/Object;Lkn;B)V", garbageValue = "0" ) public void vmethod59(Object var1, Buffer var2) { @@ -22,7 +22,7 @@ final class class2 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)Ljava/lang/Object;", + descriptor = "(Lkn;B)Ljava/lang/Object;", garbageValue = "114" ) public Object vmethod47(Buffer var1) { @@ -31,7 +31,7 @@ final class class2 implements class0 { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lkn;I)V", + descriptor = "(Ljava/lang/Long;Lkn;I)V", garbageValue = "2145124737" ) void method23(Long var1, Buffer var2) { @@ -40,16 +40,17 @@ final class class2 implements class0 { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IS)I", + descriptor = "(IS)I", garbageValue = "-12961" ) - public static int method32(int var0) { + @Export("getEntityIdUnderMouse") + public static int getEntityIdUnderMouse(int var0) { return Language.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } @ObfuscatedName("hi") @ObfuscatedSignature( - signature = "(ZLkb;I)V", + descriptor = "(ZLkb;I)V", garbageValue = "1542604247" ) @Export("updateNpcs") diff --git a/runescape-client/src/main/java/class200.java b/runescape-client/src/main/java/class200.java index 4fe61b0973..8a55c56463 100644 --- a/runescape-client/src/main/java/class200.java +++ b/runescape-client/src/main/java/class200.java @@ -5,17 +5,17 @@ import net.runelite.mapping.ObfuscatedSignature; public class class200 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgi;" + descriptor = "Lgi;" ) static final class200 field2400; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgi;" + descriptor = "Lgi;" ) static final class200 field2398; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgi;" + descriptor = "Lgi;" ) static final class200 field2399; @@ -30,7 +30,7 @@ public class class200 { @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(IZII)V", + descriptor = "(IZII)V", garbageValue = "405257362" ) public static final void method3803(int var0, boolean var1, int var2) { diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 0307b9525f..652cf5c1e6 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -26,7 +26,7 @@ public class class204 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "1343176092" ) public static int method3818(int var0, int var1) { diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 3e8d3f9956..c5e341f48a 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -12,19 +12,19 @@ public class class206 { static int field2446; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("musicSamplesArchive") public static AbstractArchive musicSamplesArchive; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; @@ -57,7 +57,7 @@ public class class206 { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIIZIB)J", + descriptor = "(IIIZIB)J", garbageValue = "1" ) @Export("calculateTag") diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java index 498f99cad2..344a13e98d 100644 --- a/runescape-client/src/main/java/class217.java +++ b/runescape-client/src/main/java/class217.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class217 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lic;IIB)[Llz;", + descriptor = "(Lic;IIB)[Llz;", garbageValue = "-104" ) public static Sprite[] method4091(AbstractArchive var0, int var1, int var2) { @@ -47,7 +47,7 @@ public class class217 { @ObfuscatedName("ja") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-1394672948" ) static final void method4092() { diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index 7c5c08ff40..f6fc34468b 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -6,20 +6,20 @@ import net.runelite.mapping.ObfuscatedSignature; public class class219 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhe;" + descriptor = "Lhe;" ) @Export("huffman") public static Huffman huffman; @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "Lbx;" + descriptor = "Lbx;" ) @Export("mouseRecorder") static MouseRecorder mouseRecorder; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)[Lif;", + descriptor = "(B)[Lif;", garbageValue = "0" ) static VerticalAlignment[] method4106() { @@ -28,7 +28,7 @@ public class class219 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Liy;", + descriptor = "(II)Liy;", garbageValue = "1818836653" ) @Export("VarpDefinition_get") @@ -50,7 +50,7 @@ public class class219 { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", + descriptor = "(Ljava/lang/CharSequence;I)I", garbageValue = "527461459" ) @Export("hashString") diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 51f648f941..559d2ef425 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -13,7 +13,7 @@ public class class22 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "4320081" ) public static int method227(int var0, int var1) { @@ -35,7 +35,7 @@ public class class22 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1618940930" ) static void method225() { @@ -49,7 +49,7 @@ public class class22 { @ObfuscatedName("fe") @ObfuscatedSignature( - signature = "(IB)V", + descriptor = "(IB)V", garbageValue = "1" ) @Export("getLoginError") diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java index 8e0d9242f1..d35ca5db20 100644 --- a/runescape-client/src/main/java/class224.java +++ b/runescape-client/src/main/java/class224.java @@ -22,7 +22,7 @@ public class class224 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)Lje;", + descriptor = "(IB)Lje;", garbageValue = "-100" ) @Export("StructDefinition_getStructDefinition") diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index 4899666221..dfba2c3e91 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -16,7 +16,7 @@ public class class225 { @ObfuscatedName("iu") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", + descriptor = "(II)Ljava/lang/String;", garbageValue = "950917676" ) static final String method4182(int var0) { diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java index 51f77b12bc..f1d2bc8268 100644 --- a/runescape-client/src/main/java/class228.java +++ b/runescape-client/src/main/java/class228.java @@ -7,13 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class class228 { @ObfuscatedName("se") @ObfuscatedSignature( - signature = "Lma;" + descriptor = "Lma;" ) @Export("worldMap") static WorldMap worldMap; @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("worldSelectStars") static IndexedSprite[] worldSelectStars; @@ -25,7 +25,7 @@ public class class228 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(ILlp;Lig;B)V", + descriptor = "(ILlp;Lig;B)V", garbageValue = "-8" ) static void method4262(int var0, ArchiveDisk var1, Archive var2) { diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index 3be773fc5f..ee12903cfc 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class23 { @ObfuscatedName("eh") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1074751797" ) static void method230(int var0, int var1) { @@ -32,7 +32,7 @@ public class class23 { @ObfuscatedName("ge") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1693964297" ) static final void method229() { diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index f8d4b3fae6..d08e896925 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -6,7 +6,7 @@ import net.runelite.rs.ScriptOpcodes; public class class231 { @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "340792557" ) static int method4277(int var0, Script var1, boolean var2) { @@ -46,7 +46,7 @@ public class class231 { @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "1553809797" ) static int method4278(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 2bf949ad47..eb6799941f 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class232 { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)[Llh;", + descriptor = "(I)[Llh;", garbageValue = "-1121273391" ) static IndexedSprite[] method4279() { diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 7043adceeb..255e0dfdae 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class234 { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lko;" + descriptor = "Lko;" ) @Export("ItemDefinition_fontPlain11") static Font ItemDefinition_fontPlain11; @@ -15,7 +15,7 @@ public class class234 { @ObfuscatedName("jd") @ObfuscatedSignature( - signature = "(Lhd;I)V", + descriptor = "(Lhd;I)V", garbageValue = "-750902552" ) @Export("invalidateWidget") diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java index f683a3b4e1..22b26c080c 100644 --- a/runescape-client/src/main/java/class235.java +++ b/runescape-client/src/main/java/class235.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class235 { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIII)Z", + descriptor = "([BIII)Z", garbageValue = "493872009" ) static final boolean method4281(byte[] var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java index d6e12ac4ca..fde7de225a 100644 --- a/runescape-client/src/main/java/class236.java +++ b/runescape-client/src/main/java/class236.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public final class class236 { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "-1064559233" ) static final int method4282(int var0, int var1) { @@ -25,7 +25,7 @@ public final class class236 { @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lef;IIII)Z", + descriptor = "(Lef;IIII)Z", garbageValue = "1976024119" ) static final boolean method4283(Model var0, int var1, int var2, int var3) { diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index c660c6c5f0..da1c675d42 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -13,7 +13,7 @@ public class class247 { final HashMap spriteMap; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llv;" + descriptor = "Llv;" ) @Export("bounds") Bounds bounds; @@ -38,7 +38,7 @@ public class class247 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-170659377" ) void method4486(int var1) { @@ -63,7 +63,7 @@ public class class247 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)Llz;", + descriptor = "(II)Llz;", garbageValue = "-1626397648" ) Sprite method4487(int var1) { @@ -76,7 +76,7 @@ public class class247 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-1291742689" ) public final void method4504(int var1, int var2) { @@ -89,7 +89,7 @@ public class class247 { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2033439477" ) public final void method4489() { @@ -98,7 +98,7 @@ public class class247 { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IILlz;FI)V", + descriptor = "(IILlz;FI)V", garbageValue = "-2127559947" ) public final void method4490(int var1, int var2, Sprite var3, float var4) { @@ -149,7 +149,7 @@ public class class247 { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Llz;Llz;Llv;B)V", + descriptor = "(Llz;Llz;Llv;B)V", garbageValue = "-113" ) void method4512(Sprite var1, Sprite var2, Bounds var3) { @@ -183,7 +183,7 @@ public class class247 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lil;", + descriptor = "(II)Lil;", garbageValue = "-125199916" ) @Export("getInvDefinition") @@ -205,7 +205,7 @@ public class class247 { @ObfuscatedName("fw") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1527669385" ) static final void method4496() { @@ -221,7 +221,7 @@ public class class247 { @ObfuscatedName("hb") @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;I)V", + descriptor = "(IIIILjava/lang/String;I)V", garbageValue = "-870187769" ) @Export("widgetDefaultMenuAction") @@ -243,7 +243,7 @@ public class class247 { } if (var11) { - int var8 = KeyHandler.getWidgetClickMask(var5); + int var8 = KeyHandler.getWidgetFlags(var5); int var9 = var0 - 1; boolean var7 = (var8 >> var9 + 1 & 1) != 0; if (var7) { diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 5e69655426..b1bd7bc3e9 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class25 { @ObfuscatedName("ns") @ObfuscatedSignature( - signature = "[Lhd;" + descriptor = "[Lhd;" ) static Widget[] field124; @ObfuscatedName("rs") @@ -17,7 +17,7 @@ public class class25 { @ObfuscatedName("ke") @ObfuscatedSignature( - signature = "(II)V", + descriptor = "(II)V", garbageValue = "-777100102" ) static void method245(int var0) { diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java index de9f27e0a3..8907f6f02d 100644 --- a/runescape-client/src/main/java/class257.java +++ b/runescape-client/src/main/java/class257.java @@ -6,14 +6,14 @@ import net.runelite.mapping.ObfuscatedSignature; public class class257 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lih;" + descriptor = "[Lih;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "-540216390" ) public static void method4679(int var0, int var1) { diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index 060ca25643..c5f96e913a 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class277 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([I[II)V", + descriptor = "([I[II)V", garbageValue = "805948782" ) public static void method5157(int[] var0, int[] var1) { diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java index 58340d61a9..b8726dba14 100644 --- a/runescape-client/src/main/java/class278.java +++ b/runescape-client/src/main/java/class278.java @@ -6,13 +6,13 @@ import net.runelite.rs.ScriptOpcodes; public class class278 { @ObfuscatedName("sb") @ObfuscatedSignature( - signature = "Lix;" + descriptor = "Lix;" ) public static class247 field3585; @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(ILcs;ZB)I", + descriptor = "(ILcs;ZB)I", garbageValue = "73" ) static int method5158(int var0, Script var1, boolean var2) { diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index 159552d75f..50c2eee9c6 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -1,9 +1,11 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("jh") public class class279 { @ObfuscatedName("p") - public static int method5159(long var0) { + @Export("Entity_unpackSceneX") + public static int Entity_unpackSceneX(long var0) { return (int)(var0 >>> 0 & 127L); } } diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index 64bd17d21b..b176108df1 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class280 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Lmo;I)Ljava/lang/String;", + descriptor = "(Ljava/lang/CharSequence;Lmo;I)Ljava/lang/String;", garbageValue = "-1896450279" ) public static String method5160(CharSequence var0, LoginType var1) { diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index f0625d7037..09b401747a 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class296 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(CI)C", + descriptor = "(CI)C", garbageValue = "1101109074" ) static char method5464(char var0) { @@ -15,7 +15,7 @@ public class class296 { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(CI)Z", + descriptor = "(CI)Z", garbageValue = "-2022540422" ) @Export("isDigit") @@ -25,7 +25,7 @@ public class class296 { @ObfuscatedName("jy") @ObfuscatedSignature( - signature = "(Lhd;IIII)V", + descriptor = "(Lhd;IIII)V", garbageValue = "-213876459" ) @Export("drawCompass") diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java index ff08d78bc2..d1b64cdb14 100644 --- a/runescape-client/src/main/java/class298.java +++ b/runescape-client/src/main/java/class298.java @@ -22,7 +22,7 @@ public final class class298 { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IZI)Ljava/lang/String;", + descriptor = "(IZI)Ljava/lang/String;", garbageValue = "-1481741683" ) @Export("intToString") diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index f2f8417a09..51400f6fe1 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -7,23 +7,23 @@ import net.runelite.mapping.ObfuscatedSignature; public class class3 implements Enumerated { @ObfuscatedName("qs") @ObfuscatedSignature( - signature = "Llz;" + descriptor = "Llz;" ) @Export("sceneMinimapSprite") static Sprite sceneMinimapSprite; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lj;" + descriptor = "Lj;" ) public static final class3 field10; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lj;" + descriptor = "Lj;" ) public static final class3 field8; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lj;" + descriptor = "Lj;" ) public static final class3 field9; @ObfuscatedName("j") @@ -40,7 +40,7 @@ public class class3 implements Enumerated { public final Class field12; @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lm;" + descriptor = "Lm;" ) public final class0 field13; @@ -51,7 +51,7 @@ public class class3 implements Enumerated { } @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Lm;)V" + descriptor = "(IILjava/lang/Class;Lm;)V" ) class3(int var1, int var2, Class var3, class0 var4) { this.field14 = var1; @@ -62,7 +62,7 @@ public class class3 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -72,7 +72,7 @@ public class class3 implements Enumerated { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;I)Ljava/lang/Object;", + descriptor = "(Lkn;I)Ljava/lang/Object;", garbageValue = "-1114505867" ) public Object method40(Buffer var1) { @@ -81,7 +81,7 @@ public class class3 implements Enumerated { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Lu;", + descriptor = "(I)[Lu;", garbageValue = "849855680" ) public static class7[] method41() { @@ -90,7 +90,7 @@ public class class3 implements Enumerated { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Lbr;", + descriptor = "(III)Lbr;", garbageValue = "-1323441814" ) @Export("Messages_getByChannelAndID") @@ -101,7 +101,7 @@ public class class3 implements Enumerated { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Lch;", + descriptor = "(B)Lch;", garbageValue = "12" ) @Export("getNextWorldListWorld") @@ -111,7 +111,7 @@ public class class3 implements Enumerated { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "([BI)V", + descriptor = "([BI)V", garbageValue = "-2060767069" ) @Export("SpriteBuffer_decode") @@ -183,7 +183,7 @@ public class class3 implements Enumerated { @ObfuscatedName("fg") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-2027582422" ) static final void method33() { diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index 26bddb0def..51a882e462 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class303 { @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-1926493501" ) static final void method5528(boolean var0) { @@ -30,7 +30,7 @@ public class class303 { @ObfuscatedName("kg") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "-1" ) static void method5525() { diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index d9be3b8722..1467e10dc4 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class307 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "-549793273" ) static int method5650(int var0, Script var1, boolean var2) { @@ -89,7 +89,7 @@ public class class307 { @ObfuscatedName("gy") @ObfuscatedSignature( - signature = "(IIIIIB)V", + descriptor = "(IIIIIB)V", garbageValue = "51" ) @Export("drawObject") diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index acf583d1b4..a62de4ed5b 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -7,32 +7,32 @@ import net.runelite.mapping.ObfuscatedSignature; public enum class322 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llx;" + descriptor = "Llx;" ) field3841(4, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llx;" + descriptor = "Llx;" ) field3836(2, 2), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llx;" + descriptor = "Llx;" ) field3837(5, 5), @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llx;" + descriptor = "Llx;" ) field3838(0, 6), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llx;" + descriptor = "Llx;" ) field3839(1, 7), @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Llx;" + descriptor = "Llx;" ) field3840(3, 8); @@ -54,7 +54,7 @@ public enum class322 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java index e18101c98a..a2043aeab0 100644 --- a/runescape-client/src/main/java/class329.java +++ b/runescape-client/src/main/java/class329.java @@ -13,7 +13,7 @@ public class class329 { @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lic;Ljava/lang/String;Ljava/lang/String;B)Llh;", + descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;B)Llh;", garbageValue = "48" ) @Export("SpriteBuffer_getIndexedSpriteByName") diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java index 2b0d4c4cd9..15743e8d03 100644 --- a/runescape-client/src/main/java/class332.java +++ b/runescape-client/src/main/java/class332.java @@ -12,18 +12,18 @@ import net.runelite.mapping.ObfuscatedSignature; public enum class332 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llw;" + descriptor = "Llw;" ) @Export("SOLID") SOLID(0, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llw;" + descriptor = "Llw;" ) field3880(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llw;" + descriptor = "Llw;" ) field3881(2, 2); @@ -46,7 +46,7 @@ public enum class332 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -56,7 +56,7 @@ public enum class332 implements Enumerated { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", garbageValue = "-353829952" ) static String method6316(Throwable var0) throws IOException { diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index fc0fa884ed..f0c6ed1233 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -9,7 +9,7 @@ public class class336 { public static boolean musicTrackBoolean; @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Llh;" + descriptor = "Llh;" ) static IndexedSprite field3912; } diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java index 0e721cde73..98b4919f60 100644 --- a/runescape-client/src/main/java/class349.java +++ b/runescape-client/src/main/java/class349.java @@ -6,13 +6,13 @@ import net.runelite.mapping.ObfuscatedSignature; public class class349 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("EnumDefinition_archive") static AbstractArchive EnumDefinition_archive; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lic;" + descriptor = "Lic;" ) @Export("Widget_spritesArchive") static AbstractArchive Widget_spritesArchive; diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index f0ee184be5..a155897083 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedSignature; public class class39 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lal;" + descriptor = "Lal;" ) static final class39 field296; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lal;" + descriptor = "Lal;" ) static final class39 field293; @ObfuscatedName("q") @@ -33,7 +33,7 @@ public class class39 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)Z", + descriptor = "(III)Z", garbageValue = "-1422185207" ) static boolean method615(int var0, int var1) { @@ -42,7 +42,7 @@ public class class39 { @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "(Lgl;I)V", + descriptor = "(Lgl;I)V", garbageValue = "-980354844" ) static final void method616(class194 var0) { diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index f02bb2ef64..4002064d3b 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -12,14 +12,14 @@ final class class4 implements class0 { static boolean ClanChat_inClanChat; @ObfuscatedName("ha") @ObfuscatedSignature( - signature = "[Llh;" + descriptor = "[Llh;" ) @Export("modIconSprites") static IndexedSprite[] modIconSprites; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkn;B)V", + descriptor = "(Ljava/lang/Object;Lkn;B)V", garbageValue = "0" ) public void vmethod59(Object var1, Buffer var2) { @@ -28,7 +28,7 @@ final class class4 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;B)Ljava/lang/Object;", + descriptor = "(Lkn;B)Ljava/lang/Object;", garbageValue = "114" ) public Object vmethod47(Buffer var1) { @@ -37,7 +37,7 @@ final class class4 implements class0 { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lkn;I)V", + descriptor = "(Ljava/lang/String;Lkn;I)V", garbageValue = "-1456597328" ) void method46(String var1, Buffer var2) { @@ -46,7 +46,7 @@ final class class4 implements class0 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", + descriptor = "([BIII)Ljava/lang/String;", garbageValue = "-1273544207" ) public static String method48(byte[] var0, int var1, int var2) { @@ -104,7 +104,7 @@ final class class4 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)Lie;", + descriptor = "(IB)Lie;", garbageValue = "0" ) @Export("SpotAnimationDefinition_get") @@ -127,7 +127,7 @@ final class class4 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)Lcs;", + descriptor = "(IIII)Lcs;", garbageValue = "-1977243752" ) @Export("getWorldMapScript") @@ -145,7 +145,7 @@ final class class4 implements class0 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIIB)V", + descriptor = "([Ljava/lang/String;[SIIB)V", garbageValue = "-1" ) @Export("sortItemsByName") @@ -183,7 +183,7 @@ final class class4 implements class0 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/io/File;ZS)Z", + descriptor = "(Ljava/io/File;ZS)Z", garbageValue = "4093" ) static boolean method58(File var0, boolean var1) { @@ -203,7 +203,7 @@ final class class4 implements class0 { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(ILcs;ZB)I", + descriptor = "(ILcs;ZB)I", garbageValue = "0" ) static int method63(int var0, Script var1, boolean var2) { @@ -564,7 +564,7 @@ final class class4 implements class0 { @ObfuscatedName("jq") @ObfuscatedSignature( - signature = "(Lhd;I)V", + descriptor = "(Lhd;I)V", garbageValue = "1118535641" ) static final void method57(Widget var0) { diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java index 9db66398fa..ae3c7cf34f 100644 --- a/runescape-client/src/main/java/class41.java +++ b/runescape-client/src/main/java/class41.java @@ -17,7 +17,7 @@ public class class41 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ZI)V", + descriptor = "(ZI)V", garbageValue = "-1502584802" ) public static void method624(boolean var0) { @@ -42,7 +42,7 @@ public class class41 { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIIIILem;Lfz;I)V", + descriptor = "(IIIIIILem;Lfz;I)V", garbageValue = "-1774275667" ) static final void method623(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { @@ -406,7 +406,7 @@ public class class41 { @ObfuscatedName("hl") @ObfuscatedSignature( - signature = "(III)V", + descriptor = "(III)V", garbageValue = "1829350132" ) @Export("updateItemPile") @@ -459,7 +459,7 @@ public class class41 { @ObfuscatedName("jj") @ObfuscatedSignature( - signature = "(Lbz;ZI)V", + descriptor = "(Lbz;ZI)V", garbageValue = "1167867750" ) @Export("closeInterface") diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index cbe2f2f779..07d97c2899 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class5 implements class12 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkn;)Lkn;" + descriptor = "(Lkn;)Lkn;" ) public Buffer vmethod133(Buffer var1) { Buffer var2 = new Buffer(100); @@ -15,7 +15,7 @@ public class class5 implements class12 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkn;Lkn;)V" + descriptor = "(Lkn;Lkn;)V" ) void method65(Buffer var1, Buffer var2) { class10 var3 = new class10(var1); diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java index 4dfde6f305..38d4a1c0a6 100644 --- a/runescape-client/src/main/java/class52.java +++ b/runescape-client/src/main/java/class52.java @@ -17,7 +17,7 @@ public final class class52 { @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)V", + descriptor = "(Ljava/lang/String;II)V", garbageValue = "-794896402" ) static final void method873(String var0, int var1) { @@ -30,7 +30,7 @@ public final class class52 { @ObfuscatedName("hq") @ObfuscatedSignature( - signature = "(III)Lga;", + descriptor = "(III)Lga;", garbageValue = "-136372501" ) static RouteStrategy method877(int var0, int var1) { diff --git a/runescape-client/src/main/java/class56.java b/runescape-client/src/main/java/class56.java index b59697cf0b..e301c43f3f 100644 --- a/runescape-client/src/main/java/class56.java +++ b/runescape-client/src/main/java/class56.java @@ -7,7 +7,7 @@ import netscape.javascript.JSObject; public class class56 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", garbageValue = "-1802347359" ) public static void method919(Applet var0, String var1) throws Throwable { diff --git a/runescape-client/src/main/java/class58.java b/runescape-client/src/main/java/class58.java index 4124eba405..13f77b7e12 100644 --- a/runescape-client/src/main/java/class58.java +++ b/runescape-client/src/main/java/class58.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class58 { @ObfuscatedName("qr") @ObfuscatedSignature( - signature = "Ldt;" + descriptor = "Ldt;" ) @Export("pcmPlayer1") static PcmPlayer pcmPlayer1; @@ -20,7 +20,7 @@ public class class58 { @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "1787909255" ) @Export("getWindowedMode") diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index f74c4edf22..49bd92fb81 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -10,7 +10,7 @@ public class class6 implements class11 { final MessageDigest field24; @ObfuscatedSignature( - signature = "(Lw;)V" + descriptor = "(Lw;)V" ) class6(class10 var1) { this.field24 = this.method77(); diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index a6365f4057..2efc5e6f0c 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class60 { @ObfuscatedName("qh") @ObfuscatedSignature( - signature = "Ldd;" + descriptor = "Ldd;" ) @Export("pcmStreamMixer") static PcmStreamMixer pcmStreamMixer; @@ -18,7 +18,7 @@ public class class60 { static String field450; @ObfuscatedName("kf") @ObfuscatedSignature( - signature = "Lby;" + descriptor = "Lby;" ) @Export("localPlayer") static Player localPlayer; @@ -30,7 +30,7 @@ public class class60 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;II)V", + descriptor = "(Lkb;II)V", garbageValue = "-220827004" ) @Export("updatePlayers") @@ -264,7 +264,7 @@ public class class60 { @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "76630753" ) public static void method972() { @@ -274,7 +274,7 @@ public class class60 { @ObfuscatedName("jc") @ObfuscatedSignature( - signature = "(Lhd;IIS)V", + descriptor = "(Lhd;IIS)V", garbageValue = "-5579" ) @Export("clickWidget") diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 592b68bd3a..fe88bafb1c 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -8,13 +8,13 @@ import net.runelite.rs.ScriptOpcodes; public enum class7 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lu;" + descriptor = "Lu;" ) field30(0, 0); @ObfuscatedName("ox") @ObfuscatedSignature( - signature = "Lfv;" + descriptor = "Lfv;" ) @Export("mouseWheel") static MouseWheel mouseWheel; @@ -38,7 +38,7 @@ public enum class7 implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", + descriptor = "(I)I", garbageValue = "-995092303" ) @Export("rsOrdinal") @@ -48,7 +48,7 @@ public enum class7 implements Enumerated { @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", + descriptor = "(Ljava/lang/String;B)V", garbageValue = "-89" ) static final void method95(String var0) { @@ -62,7 +62,7 @@ public enum class7 implements Enumerated { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(IIS)Z", + descriptor = "(IIS)Z", garbageValue = "17445" ) static final boolean method97(int var0, int var1) { @@ -80,13 +80,13 @@ public enum class7 implements Enumerated { @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(ILcs;ZI)I", + descriptor = "(ILcs;ZI)I", garbageValue = "669918470" ) static int method100(int var0, Script var1, boolean var2) { Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.method617(KeyHandler.getWidgetClickMask(var3)); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var3)); return 1; } else if (var0 != ScriptOpcodes.CC_GETOP) { if (var0 == ScriptOpcodes.CC_GETOPBASE) { @@ -115,7 +115,7 @@ public enum class7 implements Enumerated { @ObfuscatedName("gm") @ObfuscatedSignature( - signature = "(S)Z", + descriptor = "(S)Z", garbageValue = "255" ) static boolean method98() { @@ -124,7 +124,7 @@ public enum class7 implements Enumerated { @ObfuscatedName("hv") @ObfuscatedSignature( - signature = "(II)Z", + descriptor = "(II)Z", garbageValue = "-1244259463" ) static final boolean method94(int var0) { @@ -142,7 +142,7 @@ public enum class7 implements Enumerated { @ObfuscatedName("jw") @ObfuscatedSignature( - signature = "(B)V", + descriptor = "(B)V", garbageValue = "9" ) @Export("FriendSystem_invalidateFriends") diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index ebeecb4a65..2198f65ae5 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -7,27 +7,27 @@ import net.runelite.mapping.ObfuscatedSignature; public class class8 implements Callable { @ObfuscatedName("fo") @ObfuscatedSignature( - signature = "Llj;" + descriptor = "Llj;" ) static AbstractSocket field35; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) final Buffer field33; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lc;" + descriptor = "Lc;" ) final class12 field31; // $FF: synthetic field @ObfuscatedSignature( - signature = "Lz;" + descriptor = "Lz;" ) final class9 this$0; @ObfuscatedSignature( - signature = "(Lz;Lkn;Lc;)V" + descriptor = "(Lz;Lkn;Lc;)V" ) class8(class9 var1, Buffer var2, class12 var3) { this.this$0 = var1; @@ -41,7 +41,7 @@ public class class8 implements Callable { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lic;I)V", + descriptor = "(Lic;I)V", garbageValue = "2132474559" ) public static void method103(AbstractArchive var0) { @@ -50,7 +50,7 @@ public class class8 implements Callable { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)I", + descriptor = "(III)I", garbageValue = "1765213617" ) public static int method104(int var0, int var1) { @@ -65,7 +65,7 @@ public class class8 implements Callable { @ObfuscatedName("gh") @ObfuscatedSignature( - signature = "(ZLkb;I)V", + descriptor = "(ZLkb;I)V", garbageValue = "-826788637" ) @Export("loadRegions") diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java index 6d2939afdc..b14b27e2d1 100644 --- a/runescape-client/src/main/java/class89.java +++ b/runescape-client/src/main/java/class89.java @@ -22,7 +22,7 @@ public class class89 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "735302127" ) public static void method2161() { @@ -33,7 +33,7 @@ public class class89 { @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "-963420797" ) static void method2159() { diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index fab79f817e..ab76de9ad2 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -15,7 +15,7 @@ public class class9 { static int field42; @ObfuscatedName("hl") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("mapMarkerSprites") static Sprite[] mapMarkerSprites; @@ -25,17 +25,17 @@ public class class9 { Future field44; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkn;" + descriptor = "Lkn;" ) final Buffer field40; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lc;" + descriptor = "Lc;" ) final class12 field41; @ObfuscatedSignature( - signature = "(Lkn;Lc;)V" + descriptor = "(Lkn;Lc;)V" ) public class9(Buffer var1, class12 var2) { this.field45 = Executors.newSingleThreadExecutor(); @@ -46,7 +46,7 @@ public class class9 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", + descriptor = "(I)Z", garbageValue = "1196678116" ) public boolean method106() { @@ -55,7 +55,7 @@ public class class9 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1944585860" ) public void method107() { @@ -65,7 +65,7 @@ public class class9 { @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Lkn;", + descriptor = "(I)Lkn;", garbageValue = "1647170417" ) public Buffer method108() { @@ -78,7 +78,7 @@ public class class9 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "2093000238" ) void method109() { @@ -87,7 +87,7 @@ public class class9 { @ObfuscatedName("gd") @ObfuscatedSignature( - signature = "(Lby;ZI)V", + descriptor = "(Lby;ZI)V", garbageValue = "928487649" ) @Export("addPlayerToScene") @@ -127,14 +127,14 @@ public class class9 { @ObfuscatedName("jr") @ObfuscatedSignature( - signature = "([Lhd;IIIIIIII)V", + descriptor = "([Lhd;IIIIIIII)V", garbageValue = "-1819097133" ) @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.isIf3 || var9.type == 0 || var9.hasListener || KeyHandler.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || KeyHandler.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { if (var9.isIf3) { if (Entity.isComponentHidden(var9)) { continue; @@ -268,7 +268,7 @@ public class class9 { if (var9.contentType == 1400) { class228.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var26, var18); } else { - Message.method1283(var9, var26 - var10, var18 - var11); + Message.Widget_addToMenu(var9, var26 - var10, var18 - var11); } } @@ -305,8 +305,8 @@ public class class9 { class247.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); } else if (var20 == 10) { GrandExchangeOffer.Widget_runOnTargetLeave(); - AttackOption.selectSpell(var9.id, var9.childIndex, WorldMapID.method617(KeyHandler.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = WorldMapAreaData.method762(var9); + AttackOption.selectSpell(var9.id, var9.childIndex, WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var9)), var9.itemId); + Client.selectedSpellActionName = WorldMapAreaData.Widget_getSpellActionName(var9); if (Client.selectedSpellActionName == null) { Client.selectedSpellActionName = "null"; } @@ -365,7 +365,7 @@ public class class9 { class228.worldMap.method6693(var26, var18, var33 & var34, var33 & var21); } - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && WorldMapScaleHandler.method819(KeyHandler.getWidgetClickMask(var9))) { + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && WorldMapScaleHandler.method819(KeyHandler.getWidgetFlags(var9))) { Client.draggedOnWidget = var9; } @@ -678,7 +678,7 @@ public class class9 { @ObfuscatedName("kc") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", + descriptor = "(Ljava/lang/String;I)V", garbageValue = "1962834261" ) @Export("clanKickUser") diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java index 48b5adfa73..d05d04640a 100644 --- a/runescape-client/src/main/java/class90.java +++ b/runescape-client/src/main/java/class90.java @@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature; public class class90 { @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "[Llz;" + descriptor = "[Llz;" ) @Export("worldSelectBackSprites") static Sprite[] worldSelectBackSprites; @@ -23,7 +23,7 @@ public class class90 { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", + descriptor = "(I)V", garbageValue = "1343662154" ) public static void method2164() { @@ -32,7 +32,7 @@ public class class90 { @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Llz;IIII)V", + descriptor = "(Llz;IIII)V", garbageValue = "-1824687226" ) static void method2166(Sprite var0, int var1, int var2, int var3) { @@ -43,7 +43,7 @@ public class class90 { @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BIB)I", + descriptor = "(Ljava/lang/CharSequence;II[BIB)I", garbageValue = "-25" ) @Export("encodeStringCp1252") @@ -118,7 +118,7 @@ public class class90 { @ObfuscatedName("z") @ObfuscatedSignature( - signature = "([BI)Lko;", + descriptor = "([BI)Lko;", garbageValue = "166705545" ) static Font method2168(byte[] var0) { diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index c0ac5934dc..37446a674a 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -17,7 +17,7 @@ public class class92 { @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;II)V", + descriptor = "(Lkb;II)V", garbageValue = "213550097" ) @Export("readPlayerUpdate") diff --git a/runescape-client/src/main/java/net/runelite/rs/Reflection.java b/runescape-client/src/main/java/net/runelite/rs/Reflection.java index 646dc1665c..cd59af2775 100644 --- a/runescape-client/src/main/java/net/runelite/rs/Reflection.java +++ b/runescape-client/src/main/java/net/runelite/rs/Reflection.java @@ -165,7 +165,7 @@ public class Reflection return types; } - String s = sig.signature(); + String s = sig.descriptor(); int i = s.lastIndexOf(')'); char c = s.charAt(i - 1); diff --git a/wiki-scraper/wiki-scraper.gradle.kts b/wiki-scraper/wiki-scraper.gradle.kts index d3266f756c..55deec40f9 100644 --- a/wiki-scraper/wiki-scraper.gradle.kts +++ b/wiki-scraper/wiki-scraper.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") implementation(group = "com.google.guava", name = "guava", version = "29.0-jre") implementation(group = "com.github.petitparser", name = "java-petitparser", version = "2.3.1") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.7.2") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.8.0") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30")