diff --git a/deobfuscator/src/main/java/net/runelite/deob/Deob.java b/deobfuscator/src/main/java/net/runelite/deob/Deob.java index e46bdfbe20..d0be2f21d2 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/Deob.java +++ b/deobfuscator/src/main/java/net/runelite/deob/Deob.java @@ -154,7 +154,7 @@ public class Deob public static boolean isObfuscated(String name) { - return name.length() <= OBFUSCATED_NAME_MAX_LEN || name.startsWith("method") || name.startsWith("vmethod") || name.startsWith("field") || name.startsWith("class"); + return name.length() <= OBFUSCATED_NAME_MAX_LEN || name.startsWith("method") || name.startsWith("vmethod") || name.startsWith("field") || name.startsWith("class") || name.startsWith("__"); } private static void runMath(ClassGroup group) diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java new file mode 100644 index 0000000000..fe137ec096 --- /dev/null +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -0,0 +1,75 @@ +package net.runelite.deob.updater; + +import java.io.File; +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; +import net.runelite.deob.util.JarUtil; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Rule; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AnnotationCleaner +{ + private final Logger log = LoggerFactory.getLogger(AnnotationCleaner.class); + + @Rule + public DeobTestProperties properties = new DeobTestProperties(); + + @Test + public void checkMappings() throws Exception + { + File client = new File(properties.getRsClient()); + ClassGroup group = JarUtil.loadJar(client); + + for (ClassFile c : group.getClasses()) + { + if (c.getName().contains("runelite")) + { + continue; + } + + log.debug("Checking {}", c.toString()); + + for (Field f : c.getFields()) + { + Annotations an = f.getAnnotations(); + + String fieldName = f.getName(); + String exportedName = DeobAnnotations.getExportedName(an); + + if (exportedName == null) + { + assertTrue("Field " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.contains("$")); + continue; + } + + assertEquals("Field " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); + } + + for (Method m : c.getMethods()) + { + Annotations an = m.getAnnotations(); + + String fieldName = m.getName(); + String exportedName = DeobAnnotations.getExportedName(an); + + if (exportedName == null) + { + assertTrue("Method " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.endsWith("init>") || fieldName.equals("values") || fieldName.equals("valueOf") || fieldName.startsWith("compareTo") || fieldName.equals("equals") || fieldName.equals("hashCode") || fieldName.equals("compare")); + continue; + } + + assertEquals("Method " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName); + } + } + } +} diff --git a/deobfuscator/src/test/resources/deob-test.properties b/deobfuscator/src/test/resources/deob-test.properties index e26a22a2b9..9d858d1a0b 100644 --- a/deobfuscator/src/test/resources/deob-test.properties +++ b/deobfuscator/src/test/resources/deob-test.properties @@ -1,3 +1,3 @@ rs.client=${net.runelite.rs:rs-client:jar} -rs.version=180 +rs.version=${rs.version} vanilla.client=${net.runelite.rs:vanilla:jar} \ No newline at end of file diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 43726e2638..f87ef77718 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -13,7 +13,6 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( signature = "Lit;" ) - @Export("__gu_et") static IndexCache __gu_et; static { @@ -41,6 +40,7 @@ public abstract class AbstractByteArrayCopier { signature = "(II)Liw;", garbageValue = "1102198559" ) + @Export("getVarcInt") public static VarcInt getVarcInt(int var0) { VarcInt var1 = (VarcInt)VarcInt.cachedVarcInts.get((long)var0); if(var1 != null) { @@ -62,6 +62,7 @@ public abstract class AbstractByteArrayCopier { signature = "(II)V", garbageValue = "-1941491045" ) + @Export("unloadWidgetGroup") public static void unloadWidgetGroup(int var0) { if(var0 != -1) { if(Widget.loadedWidgetGroups[var0]) { diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java index bfd06c03eb..22249e8e50 100644 --- a/runescape-client/src/main/java/AbstractIndexCache.java +++ b/runescape-client/src/main/java/AbstractIndexCache.java @@ -24,7 +24,6 @@ public abstract class AbstractIndexCache { @ObfuscatedGetter( intValue = -244224193 ) - @Export("__ir_s") static int __ir_s; @ObfuscatedName("au") @Export("garbageCollector") @@ -33,7 +32,6 @@ public abstract class AbstractIndexCache { @ObfuscatedGetter( intValue = 334735939 ) - @Export("__ir_bu") static int __ir_bu; @ObfuscatedName("di") @ObfuscatedSignature( @@ -247,7 +245,6 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "2102142648" ) - @Export("__f_392") void __f_392(int var1) { } @@ -317,7 +314,6 @@ public abstract class AbstractIndexCache { signature = "(II)Z", garbageValue = "-1923759754" ) - @Export("__u_393") public boolean __u_393(int var1) { if(this.records.length == 1) { return this.tryLoadRecord(0, var1); @@ -348,7 +344,6 @@ public abstract class AbstractIndexCache { signature = "(I)Z", garbageValue = "1694975256" ) - @Export("__l_394") public boolean __l_394() { boolean var1 = true; @@ -447,7 +442,6 @@ public abstract class AbstractIndexCache { signature = "(IB)[I", garbageValue = "28" ) - @Export("__j_395") public int[] __j_395(int var1) { return var1 >= 0 && var1 < this.recordIds.length?this.recordIds[var1]:null; } @@ -457,7 +451,6 @@ public abstract class AbstractIndexCache { signature = "(II)I", garbageValue = "1178362496" ) - @Export("__s_396") public int __s_396(int var1) { return this.records[var1].length; } @@ -467,7 +460,6 @@ public abstract class AbstractIndexCache { signature = "(I)I", garbageValue = "1702434573" ) - @Export("__t_397") public int __t_397() { return this.records.length; } @@ -477,7 +469,6 @@ public abstract class AbstractIndexCache { signature = "(B)V", garbageValue = "38" ) - @Export("__y_398") public void __y_398() { for(int var1 = 0; var1 < this.archives.length; ++var1) { this.archives[var1] = null; @@ -490,7 +481,6 @@ public abstract class AbstractIndexCache { signature = "(II)V", garbageValue = "330258899" ) - @Export("__h_399") public void __h_399(int var1) { for(int var2 = 0; var2 < this.records[var1].length; ++var2) { this.records[var1][var2] = null; @@ -503,7 +493,6 @@ public abstract class AbstractIndexCache { signature = "(I)V", garbageValue = "-709581639" ) - @Export("__b_400") public void __b_400() { for(int var1 = 0; var1 < this.records.length; ++var1) { if(this.records[var1] != null) { @@ -640,7 +629,6 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;Ljava/lang/String;B)Z", garbageValue = "68" ) - @Export("__ag_401") public boolean __ag_401(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); @@ -698,7 +686,6 @@ public abstract class AbstractIndexCache { signature = "(Ljava/lang/String;B)V", garbageValue = "40" ) - @Export("__ar_402") public void __ar_402(String var1) { var1 = var1.toLowerCase(); int var2 = this.archiveNameHashTable.get(Client.hashString(var1)); diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 2dae4f18da..2ce70ecb9b 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("f") - @Export("__f") Comparator __f; @ObfuscatedName("e") @@ -16,7 +15,6 @@ public abstract class AbstractUserComparator implements Comparator { signature = "(Ljava/util/Comparator;B)V", garbageValue = "-2" ) - @Export("__e_460") final void __e_460(Comparator var1) { if(this.__f == null) { this.__f = var1; @@ -31,12 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-962181316" ) - @Export("__x_461") protected final int __x_461(User var1, User var2) { return this.__f == null?0:this.__f.compare(var1, var2); } - @Export("__equals_462") @ObfuscatedName("equals") public boolean __equals_462(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index c487caa190..f98c6c3107 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -11,7 +11,6 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -1942470229 ) - @Export("__ak_qj") static int __ak_qj; @ObfuscatedName("ka") @ObfuscatedGetter( @@ -35,13 +34,11 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -521086143 ) - @Export("__e") int __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1065362217 ) - @Export("__x") int __x; @ObfuscatedSignature( @@ -85,7 +82,6 @@ public abstract class AbstractWorldMapIcon { signature = "(IIB)Z", garbageValue = "-63" ) - @Export("__y_66") boolean __y_66(int var1, int var2) { return this.__b_68(var1, var2)?true:this.__c_69(var1, var2); } @@ -95,7 +91,6 @@ public abstract class AbstractWorldMapIcon { signature = "(I)Z", garbageValue = "1150380891" ) - @Export("__h_67") boolean __h_67() { return this.__m_15() >= 0; } @@ -105,7 +100,6 @@ public abstract class AbstractWorldMapIcon { signature = "(III)Z", garbageValue = "484201257" ) - @Export("__b_68") boolean __b_68(int var1, int var2) { if(!this.__h_67()) { return false; @@ -157,7 +151,6 @@ public abstract class AbstractWorldMapIcon { signature = "(III)Z", garbageValue = "1201712205" ) - @Export("__c_69") boolean __c_69(int var1, int var2) { WorldMapLabel var3 = this.__f_16(); return var3 == null?false:(var1 >= this.__e - var3.width / 2 && var1 <= var3.width / 2 + this.__e?var2 >= this.__x && var2 <= var3.height + this.__x:false); diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 304b83c20f..cf25c7a265 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -16,13 +16,11 @@ public final class AccessFile { @ObfuscatedGetter( intValue = -1762891465 ) - @Export("__dk_o") static int __dk_o; @ObfuscatedName("lm") @ObfuscatedSignature( signature = "Lho;" ) - @Export("__dk_lm") static Widget __dk_lm; @ObfuscatedName("m") @Export("file") @@ -142,7 +140,6 @@ public final class AccessFile { return var4; } - @Export("__finalize_211") @ObfuscatedName("finalize") protected void __finalize_211() throws Throwable { if(this.file != null) { @@ -157,6 +154,7 @@ public final class AccessFile { signature = "(Lho;Ljv;IIZI)V", garbageValue = "-728558316" ) + @Export("addWidgetItemMenuItem") static final void addWidgetItemMenuItem(Widget widget, ItemDefinition definition, int var2, int actionIndex, boolean shiftClick) { String[] var5 = definition.inventoryActions; byte opcode = -1; diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 2deeb4ef84..ded998f3de 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -23,10 +23,8 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 1439711403 ) - @Export("__ac") int __ac; @ObfuscatedName("ay") - @Export("__ay") boolean __ay; @ObfuscatedName("ah") @ObfuscatedGetter( @@ -95,7 +93,6 @@ public abstract class Actor extends Entity { @Export("isAutoChatting") boolean isAutoChatting; @ObfuscatedName("az") - @Export("__az") boolean __az; @ObfuscatedName("au") @ObfuscatedGetter( @@ -152,7 +149,6 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 139384875 ) - @Export("__bc") int __bc; @ObfuscatedName("bo") @ObfuscatedGetter( @@ -200,7 +196,6 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1523249259 ) - @Export("__bj") int __bj; @ObfuscatedName("bi") @ObfuscatedGetter( @@ -224,7 +219,6 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 886371765 ) - @Export("__bt") int __bt; @ObfuscatedName("bp") @ObfuscatedGetter( @@ -236,43 +230,36 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 2121599561 ) - @Export("__bf") int __bf; @ObfuscatedName("bh") @ObfuscatedGetter( intValue = 280591281 ) - @Export("__bh") int __bh; @ObfuscatedName("be") @ObfuscatedGetter( intValue = 837989037 ) - @Export("__be") int __be; @ObfuscatedName("bv") @ObfuscatedGetter( intValue = -1857513783 ) - @Export("__bv") int __bv; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = -1630403001 ) - @Export("__bw") int __bw; @ObfuscatedName("cr") @ObfuscatedGetter( intValue = 1367256299 ) - @Export("__cr") int __cr; @ObfuscatedName("cv") @ObfuscatedGetter( intValue = -1723834619 ) - @Export("__cv") int __cv; @ObfuscatedName("ce") @ObfuscatedGetter( @@ -296,13 +283,11 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 1252341007 ) - @Export("__cm") int __cm; @ObfuscatedName("cj") @ObfuscatedGetter( intValue = -336931157 ) - @Export("__cj") int __cj; @ObfuscatedName("cu") @ObfuscatedGetter( @@ -323,13 +308,11 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1583514013 ) - @Export("__cq") int __cq; @ObfuscatedName("ch") @ObfuscatedGetter( intValue = 1584102533 ) - @Export("__ch") int __ch; Actor() { @@ -386,6 +369,7 @@ public abstract class Actor extends Entity { signature = "(B)Z", garbageValue = "1" ) + @Export("isVisible") boolean isVisible() { return false; } @@ -395,7 +379,6 @@ public abstract class Actor extends Entity { signature = "(I)V", garbageValue = "1415393262" ) - @Export("__bb_143") final void __bb_143() { this.pathLength = 0; this.__ch = 0; diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index a6157a7c73..826dd5043d 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -7,16 +7,12 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Animation") public class Animation { @ObfuscatedName("m") - @Export("__dz_m") static int[] __dz_m; @ObfuscatedName("f") - @Export("__dz_f") static int[] __dz_f; @ObfuscatedName("q") - @Export("__dz_q") static int[] __dz_q; @ObfuscatedName("w") - @Export("__dz_w") static int[] __dz_w; @ObfuscatedName("o") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 699c61117b..49787eda2c 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -34,10 +34,8 @@ public enum AttackOption implements Enumerated { @Export("AttackOption_hidden") AttackOption_hidden(3); @ObfuscatedName("sp") - @Export("__cj_sp") static short[] __cj_sp; @ObfuscatedName("ay") - @Export("__cj_ay") static String __cj_ay; @ObfuscatedName("bo") @ObfuscatedSignature( @@ -61,6 +59,7 @@ public enum AttackOption implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 84c98f85b8..4c84f460d0 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -7,28 +7,20 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AudioFilter") public class AudioFilter { @ObfuscatedName("u") - @Export("__di_u") static float[][] __di_u; @ObfuscatedName("g") - @Export("__di_g") static int[][] __di_g; @ObfuscatedName("l") - @Export("__di_l") static float __di_l; @ObfuscatedName("e") - @Export("__di_e") static int __di_e; @ObfuscatedName("m") - @Export("__m") int[] __m; @ObfuscatedName("q") - @Export("__q") int[][][] __q; @ObfuscatedName("w") - @Export("__w") int[][][] __w; @ObfuscatedName("o") - @Export("__o") int[] __o; static { @@ -44,7 +36,6 @@ public class AudioFilter { } @ObfuscatedName("m") - @Export("__m_205") float __m_205(int var1, int var2, float var3) { float var4 = (float)this.__w[var1][0][var2] + var3 * (float)(this.__w[var1][1][var2] - this.__w[var1][0][var2]); var4 *= 0.0015258789F; @@ -52,7 +43,6 @@ public class AudioFilter { } @ObfuscatedName("q") - @Export("__q_206") float __q_206(int var1, int var2, float var3) { float var4 = (float)this.__q[var1][0][var2] + var3 * (float)(this.__q[var1][1][var2] - this.__q[var1][0][var2]); var4 *= 1.2207031E-4F; @@ -60,7 +50,6 @@ public class AudioFilter { } @ObfuscatedName("w") - @Export("__w_207") int __w_207(int var1, float var2) { float var3; if(var1 == 0) { @@ -111,7 +100,6 @@ public class AudioFilter { @ObfuscatedSignature( signature = "(Lgr;Lde;)V" ) - @Export("__o_208") final void __o_208(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.__m[0] = var3 >> 4; diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 659c924834..8c65d3323a 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -11,7 +11,6 @@ public final class BoundaryObject { @ObfuscatedSignature( signature = "Lho;" ) - @Export("__ej_jv") static Widget __ej_jv; @ObfuscatedName("m") @ObfuscatedGetter( @@ -78,6 +77,7 @@ public final class BoundaryObject { signature = "(Ljava/lang/String;B)V", garbageValue = "103" ) + @Export("doCheat") static final void doCheat(String var0) { if(var0.equalsIgnoreCase("toggleroof")) { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index f265d60cf0..45b2743682 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -11,25 +11,21 @@ public class Bounds { @ObfuscatedGetter( intValue = -2004088829 ) - @Export("__m") public int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1887298731 ) - @Export("__f") public int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2001187823 ) - @Export("__q") public int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1377856837 ) - @Export("__w") public int __w; public Bounds(int var1, int var2, int var3, int var4) { @@ -46,7 +42,6 @@ public class Bounds { signature = "(IIB)V", garbageValue = "1" ) - @Export("__m_487") public void __m_487(int var1, int var2) { this.__m = var1; this.__f = var2; @@ -57,7 +52,6 @@ public class Bounds { signature = "(III)V", garbageValue = "-11269827" ) - @Export("__f_488") public void __f_488(int var1, int var2) { this.__q = var1; this.__w = var2; @@ -68,7 +62,6 @@ public class Bounds { signature = "(Lla;Lla;I)V", garbageValue = "-2123792170" ) - @Export("__q_490") public void __q_490(Bounds var1, Bounds var2) { this.__w_491(var1, var2); this.__o_492(var1, var2); @@ -79,7 +72,6 @@ public class Bounds { signature = "(Lla;Lla;I)V", garbageValue = "314675149" ) - @Export("__w_491") void __w_491(Bounds var1, Bounds var2) { var2.__m = this.__m; var2.__q = this.__q; @@ -103,7 +95,6 @@ public class Bounds { signature = "(Lla;Lla;S)V", garbageValue = "128" ) - @Export("__o_492") void __o_492(Bounds var1, Bounds var2) { var2.__f = this.__f; var2.__w = this.__w; @@ -127,7 +118,6 @@ public class Bounds { signature = "(I)I", garbageValue = "-1842151293" ) - @Export("__u_493") int __u_493() { return this.__m + this.__q; } @@ -137,12 +127,10 @@ public class Bounds { signature = "(B)I", garbageValue = "-22" ) - @Export("__g_494") int __g_494() { return this.__f + this.__w; } - @Export("__toString_489") @ObfuscatedName("toString") public String __toString_489() { return null; diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 4e643dadd2..42a54d7e6b 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -66,6 +66,7 @@ public class Buddy extends User { signature = "(I)V", garbageValue = "1868787018" ) + @Export("processOverheadText") static final void processOverheadText() { int[] var0 = Players.Players_indices; diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 834f7c642d..c711dc32c1 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -9,10 +9,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Buffer") public class Buffer extends Node { @ObfuscatedName("q") - @Export("__gr_q") static int[] __gr_q; @ObfuscatedName("o") - @Export("__gr_o") static long[] __gr_o; @ObfuscatedName("m") @Export("array") @@ -75,7 +73,6 @@ public class Buffer extends Node { signature = "(S)V", garbageValue = "13572" ) - @Export("__f_295") public void __f_295() { if(this.array != null) { VertexNormal.method2984(this.array); @@ -202,7 +199,6 @@ public class Buffer extends Node { signature = "(Ljava/lang/CharSequence;B)V", garbageValue = "58" ) - @Export("__j_296") public void __j_296(CharSequence var1) { int var3 = var1.length(); int var4 = 0; @@ -228,7 +224,6 @@ public class Buffer extends Node { signature = "([BIII)V", garbageValue = "-1915344405" ) - @Export("__s_297") public void __s_297(byte[] var1, int var2, int var3) { for(int var4 = var2; var4 < var3 + var2; ++var4) { this.array[++this.index - 1] = var1[var4]; @@ -241,7 +236,6 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-225163682" ) - @Export("__t_298") public void __t_298(int var1) { this.array[this.index - var1 - 4] = (byte)(var1 >> 24); this.array[this.index - var1 - 3] = (byte)(var1 >> 16); @@ -254,7 +248,6 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1298210761" ) - @Export("__y_299") public void __y_299(int var1) { this.array[this.index - var1 - 2] = (byte)(var1 >> 8); this.array[this.index - var1 - 1] = (byte)var1; @@ -265,7 +258,6 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1839722163" ) - @Export("__h_300") public void __h_300(int var1) { this.array[this.index - var1 - 1] = (byte)var1; } @@ -291,7 +283,6 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "820873705" ) - @Export("__c_301") public void __c_301(int var1) { if((var1 & -128) != 0) { if((var1 & -16384) != 0) { @@ -337,7 +328,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-86" ) - @Export("__ag_302") public int __ag_302() { this.index += 2; return (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); @@ -348,7 +338,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "1" ) - @Export("__aq_303") public int __aq_303() { this.index += 2; int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8); @@ -462,7 +451,6 @@ public class Buffer extends Node { signature = "(B)Ljava/lang/String;", garbageValue = "-14" ) - @Export("__aw_304") public String __aw_304() { byte var1 = this.array[++this.index - 1]; if(var1 != 0) { @@ -535,7 +523,6 @@ public class Buffer extends Node { signature = "([BIIB)V", garbageValue = "-122" ) - @Export("__al_305") public void __al_305(byte[] var1, int var2, int var3) { for(int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = this.array[++this.index - 1]; @@ -548,7 +535,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-24" ) - @Export("__ab_306") public int __ab_306() { int var1 = this.array[this.index] & 255; return var1 < 128?this.readUnsignedByte() - 64:this.__ag_302() - 49152; @@ -559,7 +545,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "1370512869" ) - @Export("__ae_307") public int __ae_307() { int var1 = this.array[this.index] & 255; return var1 < 128?this.readUnsignedByte():this.__ag_302() - 32768; @@ -570,7 +555,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "1177684230" ) - @Export("__at_308") public int __at_308() { int var1 = 0; @@ -588,7 +572,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "103" ) - @Export("__ad_309") public int __ad_309() { return this.array[this.index] < 0?this.readInt() & Integer.MAX_VALUE:this.__ag_302(); } @@ -598,7 +581,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1151173205" ) - @Export("__ap_310") public int __ap_310() { if(this.array[this.index] < 0) { return this.readInt() & Integer.MAX_VALUE; @@ -613,7 +595,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "984135559" ) - @Export("__as_311") public int __as_311() { byte var1 = this.array[++this.index - 1]; @@ -765,7 +746,6 @@ public class Buffer extends Node { signature = "(II)I", garbageValue = "-484928770" ) - @Export("__aa_312") public int __aa_312(int var1) { byte[] var3 = this.array; int var4 = this.index; @@ -785,7 +765,6 @@ public class Buffer extends Node { signature = "(B)Z", garbageValue = "-11" ) - @Export("__ax_313") public boolean __ax_313() { this.index -= 4; byte[] var2 = this.array; @@ -807,7 +786,6 @@ public class Buffer extends Node { signature = "(IB)V", garbageValue = "-47" ) - @Export("__af_314") public void __af_314(int var1) { this.array[++this.index - 1] = (byte)(var1 + 128); } @@ -817,7 +795,6 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "-1336494664" ) - @Export("__ai_315") public void __ai_315(int var1) { this.array[++this.index - 1] = (byte)(0 - var1); } @@ -827,7 +804,6 @@ public class Buffer extends Node { signature = "(IB)V", garbageValue = "21" ) - @Export("__ba_316") public void __ba_316(int var1) { this.array[++this.index - 1] = (byte)(128 - var1); } @@ -837,7 +813,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-86972759" ) - @Export("__bb_317") public int __bb_317() { return this.array[++this.index - 1] - 128 & 255; } @@ -857,7 +832,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "359814653" ) - @Export("__bq_318") public int __bq_318() { return 128 - this.array[++this.index - 1] & 255; } @@ -867,7 +841,6 @@ public class Buffer extends Node { signature = "(I)B", garbageValue = "2130167320" ) - @Export("__bn_319") public byte __bn_319() { return (byte)(this.array[++this.index - 1] - 128); } @@ -877,7 +850,6 @@ public class Buffer extends Node { signature = "(I)B", garbageValue = "1415936818" ) - @Export("__bk_320") public byte __bk_320() { return (byte)(0 - this.array[++this.index - 1]); } @@ -887,7 +859,6 @@ public class Buffer extends Node { signature = "(I)B", garbageValue = "1496705333" ) - @Export("__bd_321") public byte __bd_321() { return (byte)(128 - this.array[++this.index - 1]); } @@ -908,7 +879,6 @@ public class Buffer extends Node { signature = "(II)V", garbageValue = "189694315" ) - @Export("__bo_322") public void __bo_322(int var1) { this.array[++this.index - 1] = (byte)(var1 >> 8); this.array[++this.index - 1] = (byte)(var1 + 128); @@ -919,7 +889,6 @@ public class Buffer extends Node { signature = "(IB)V", garbageValue = "-7" ) - @Export("__bx_323") public void __bx_323(int var1) { this.array[++this.index - 1] = (byte)(var1 + 128); this.array[++this.index - 1] = (byte)(var1 >> 8); @@ -930,7 +899,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "2147134369" ) - @Export("__by_324") public int __by_324() { this.index += 2; return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255); @@ -941,7 +909,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1489217204" ) - @Export("__bu_325") public int __bu_325() { this.index += 2; return (this.array[this.index - 1] - 128 & 255) + ((this.array[this.index - 2] & 255) << 8); @@ -952,7 +919,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-86" ) - @Export("__bm_326") public int __bm_326() { this.index += 2; return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255); @@ -963,7 +929,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "54" ) - @Export("__bl_327") public int __bl_327() { this.index += 2; int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255); @@ -979,7 +944,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "388487388" ) - @Export("__br_328") public int __br_328() { this.index += 2; int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255); @@ -995,7 +959,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-88751042" ) - @Export("__bj_329") public int __bj_329() { this.index += 3; return (this.array[this.index - 3] & 255) + ((this.array[this.index - 2] & 255) << 8) + ((this.array[this.index - 1] & 255) << 16); @@ -1045,7 +1008,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1322860835" ) - @Export("__bt_330") public int __bt_330() { this.index += 4; return (this.array[this.index - 4] & 255) + ((this.array[this.index - 3] & 255) << 8) + ((this.array[this.index - 2] & 255) << 16) + ((this.array[this.index - 1] & 255) << 24); @@ -1056,7 +1018,6 @@ public class Buffer extends Node { signature = "(I)I", garbageValue = "-1731171028" ) - @Export("__bp_331") public int __bp_331() { this.index += 4; return ((this.array[this.index - 2] & 255) << 24) + ((this.array[this.index - 4] & 255) << 8) + (this.array[this.index - 3] & 255) + ((this.array[this.index - 1] & 255) << 16); @@ -1067,7 +1028,6 @@ public class Buffer extends Node { signature = "(B)I", garbageValue = "-126" ) - @Export("__bf_332") public int __bf_332() { this.index += 4; return ((this.array[this.index - 1] & 255) << 8) + ((this.array[this.index - 4] & 255) << 16) + (this.array[this.index - 2] & 255) + ((this.array[this.index - 3] & 255) << 24); @@ -1078,7 +1038,6 @@ public class Buffer extends Node { signature = "([BIII)V", garbageValue = "1303287859" ) - @Export("__bh_333") public void __bh_333(byte[] var1, int var2, int var3) { for(int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.index - 1] - 128); @@ -1091,6 +1050,7 @@ public class Buffer extends Node { signature = "(B)V", garbageValue = "1" ) + @Export("clearHealthbarCaches") public static void clearHealthbarCaches() { HealthBarDefinition.HealthBarDefinition_cached.clear(); HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index c6217ee7c9..5b4292d34b 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -23,13 +23,11 @@ public class BufferedFile { @ObfuscatedGetter( longValue = -7773729680030815835L ) - @Export("__q") long __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -846810907 ) - @Export("__w") int __w; @ObfuscatedName("o") @Export("writeBuffer") @@ -38,25 +36,21 @@ public class BufferedFile { @ObfuscatedGetter( longValue = 5249231081498323007L ) - @Export("__u") long __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1558233611 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( longValue = -6819476051574242871L ) - @Export("__l") long __l; @ObfuscatedName("e") @ObfuscatedGetter( longValue = -3728247331531750871L ) - @Export("__e") long __e; @ObfuscatedName("x") @ObfuscatedGetter( @@ -68,7 +62,6 @@ public class BufferedFile { @ObfuscatedGetter( longValue = 5720856138805191881L ) - @Export("__d") long __d; @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index c954347832..1b5b13c43e 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -39,6 +39,7 @@ public class BufferedNetSocket extends AbstractSocket { signature = "(II)Z", garbageValue = "1765046516" ) + @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } @@ -48,6 +49,7 @@ public class BufferedNetSocket extends AbstractSocket { signature = "(I)I", garbageValue = "-1078471130" ) + @Export("available") public int available() throws IOException { return this.source.available(); } @@ -57,6 +59,7 @@ public class BufferedNetSocket extends AbstractSocket { signature = "(I)I", garbageValue = "516705222" ) + @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } @@ -66,6 +69,7 @@ public class BufferedNetSocket extends AbstractSocket { signature = "([BIII)I", garbageValue = "-1089665746" ) + @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } @@ -75,6 +79,7 @@ public class BufferedNetSocket extends AbstractSocket { signature = "([BIIB)V", garbageValue = "-86" ) + @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); } @@ -84,6 +89,7 @@ public class BufferedNetSocket extends AbstractSocket { signature = "(I)V", garbageValue = "-1252618448" ) + @Export("close") public void close() { this.sink.close(); @@ -96,7 +102,6 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @Export("__finalize_280") @ObfuscatedName("finalize") protected void __finalize_280() { this.close(); diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index f0aee8a0c5..5069205f88 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -14,7 +14,6 @@ public class BufferedSource implements Runnable { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__fh_x") public static AbstractIndexCache __fh_x; @ObfuscatedName("m") @Export("thread") diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index edbac8c291..8ac8278150 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -35,7 +35,6 @@ public class ByteArrayPool { @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; @ObfuscatedName("g") - @Export("__gi_g") static int[] __gi_g; @ObfuscatedName("dz") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Bzip2State.java b/runescape-client/src/main/java/Bzip2State.java index 8e116328f1..41c6b17ddc 100644 --- a/runescape-client/src/main/java/Bzip2State.java +++ b/runescape-client/src/main/java/Bzip2State.java @@ -7,52 +7,40 @@ import net.runelite.mapping.ObfuscatedName; @Implements("Bzip2State") public final class Bzip2State { @ObfuscatedName("m") - @Export("__m") final int __m; @ObfuscatedName("f") - @Export("__f") final int __f; @ObfuscatedName("q") - @Export("__q") final int __q; @ObfuscatedName("w") - @Export("__w") final int __w; @ObfuscatedName("o") - @Export("__o") final int __o; @ObfuscatedName("u") - @Export("__u") final int __u; @ObfuscatedName("g") - @Export("__g") byte[] __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1510817847 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -473971741 ) - @Export("__e") int __e; @ObfuscatedName("x") - @Export("__x") byte[] __x; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -861462251 ) - @Export("__d") int __d; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 594179173 ) - @Export("__k") int __k; @ObfuscatedName("n") @ObfuscatedGetter( @@ -60,109 +48,84 @@ public final class Bzip2State { ) int __n; @ObfuscatedName("i") - @Export("__i") byte __i; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1994129645 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1793367959 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -1987934943 ) - @Export("__j") int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1172102327 ) - @Export("__s") int __s; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1502359789 ) - @Export("__t") int __t; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -953353963 ) - @Export("__y") int __y; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -1981923611 ) - @Export("__h") int __h; @ObfuscatedName("b") - @Export("__b") int[] __b; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -557334365 ) - @Export("__c") int __c; @ObfuscatedName("r") - @Export("__r") int[] __r; @ObfuscatedName("v") @ObfuscatedGetter( intValue = -886333045 ) - @Export("__v") int __v; @ObfuscatedName("ag") - @Export("__ag") boolean[] __ag; @ObfuscatedName("aq") - @Export("__aq") boolean[] __aq; @ObfuscatedName("aj") - @Export("__aj") byte[] __aj; @ObfuscatedName("av") - @Export("__av") byte[] __av; @ObfuscatedName("ar") - @Export("__ar") int[] __ar; @ObfuscatedName("ac") - @Export("__ac") byte[] __ac; @ObfuscatedName("ay") - @Export("__ay") byte[] __ay; @ObfuscatedName("ah") - @Export("__ah") byte[][] __ah; @ObfuscatedName("ak") - @Export("__ak") int[][] __ak; @ObfuscatedName("aw") - @Export("__aw") int[][] __aw; @ObfuscatedName("al") - @Export("__al") int[][] __al; @ObfuscatedName("ab") - @Export("__ab") int[] __ab; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 444639767 ) - @Export("__ae") int __ae; Bzip2State() { diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 758b6637d0..ccea55acb9 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -15,13 +15,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Canvas") public final class Canvas extends java.awt.Canvas { @ObfuscatedName("s") - @Export("__ao_s") public static String[] __ao_s; @ObfuscatedName("gk") @ObfuscatedGetter( intValue = -1131782991 ) - @Export("__ao_gk") static int __ao_gk; @ObfuscatedName("jk") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 5b004c23d7..608c06c72c 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -26,7 +26,6 @@ public class ClanChat extends UserList { @Export("owner") public String owner; @ObfuscatedName("k") - @Export("__k") public byte __k; @ObfuscatedName("n") @ObfuscatedGetter( @@ -38,7 +37,6 @@ public class ClanChat extends UserList { @ObfuscatedGetter( intValue = 386706253 ) - @Export("__i") int __i; @ObfuscatedSignature( @@ -58,6 +56,7 @@ public class ClanChat extends UserList { signature = "(I)Ljs;", garbageValue = "-2063112195" ) + @Export("newInstance") User newInstance() { return new ClanMate(); } @@ -67,6 +66,7 @@ public class ClanChat extends UserList { signature = "(II)[Ljs;", garbageValue = "861814350" ) + @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } @@ -76,7 +76,6 @@ public class ClanChat extends UserList { signature = "(Ljava/lang/String;I)V", garbageValue = "242122326" ) - @Export("__q_472") final void __q_472(String var1) { this.name = HealthBarUpdate.method1722(var1); } @@ -86,7 +85,6 @@ public class ClanChat extends UserList { signature = "(Ljava/lang/String;B)V", garbageValue = "103" ) - @Export("__x_473") final void __x_473(String var1) { this.owner = HealthBarUpdate.method1722(var1); } @@ -150,7 +148,6 @@ public class ClanChat extends UserList { signature = "(Lgr;B)V", garbageValue = "24" ) - @Export("__a_474") public final void __a_474(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.__ag_302(); @@ -219,7 +216,6 @@ public class ClanChat extends UserList { signature = "(Ljk;I)V", garbageValue = "-128608554" ) - @Export("__cp_475") final void __cp_475(ClanMate var1) { if(var1.username().equals(this.localUser.username())) { this.rank = var1.rank; diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 1398a764a9..402943369d 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -30,7 +30,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1348053843 ) - @Export("__client_oo") static int __client_oo; @ObfuscatedName("os") @ObfuscatedGetter( @@ -42,19 +41,14 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( longValue = 8818983958751331899L ) - @Export("__client_oa") static long __client_oa; @ObfuscatedName("od") - @Export("__client_od") static boolean[] __client_od; @ObfuscatedName("oq") - @Export("__client_oq") static boolean[] __client_oq; @ObfuscatedName("ot") - @Export("__client_ot") static boolean[] __client_ot; @ObfuscatedName("nt") - @Export("__client_nt") static boolean __client_nt; @ObfuscatedName("ng") @ObfuscatedGetter( @@ -69,19 +63,15 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -451622431 ) - @Export("__client_ss") public static int __client_ss; @ObfuscatedName("na") @ObfuscatedGetter( intValue = -934082817 ) - @Export("__client_na") static int __client_na; @ObfuscatedName("nn") - @Export("__client_nn") static boolean __client_nn; @ObfuscatedName("qq") - @Export("__client_qq") static boolean __client_qq; @ObfuscatedName("mt") @ObfuscatedGetter( @@ -99,7 +89,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -843739713 ) - @Export("__client_nw") static int __client_nw; @ObfuscatedName("mr") @ObfuscatedSignature( @@ -123,7 +112,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1939745821 ) - @Export("__client_nl") static int __client_nl; @ObfuscatedName("mx") @ObfuscatedSignature( @@ -173,13 +161,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1019025247 ) - @Export("__client_nk") static int __client_nk; @ObfuscatedName("np") @ObfuscatedGetter( intValue = 1881890525 ) - @Export("__client_np") static int __client_np; @ObfuscatedName("pd") @ObfuscatedGetter( @@ -197,13 +183,10 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -34294211 ) - @Export("__client_qy") static int __client_qy; @ObfuscatedName("tp") - @Export("__client_tp") static int[] __client_tp; @ObfuscatedName("th") - @Export("__client_th") static int[] __client_th; @ObfuscatedName("ny") @Export("isDraggingWidget") @@ -236,28 +219,23 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -818676431 ) - @Export("__client_qc") static int __client_qc; @ObfuscatedName("nz") - @Export("__client_nz") static int[] __client_nz; @ObfuscatedName("ns") @ObfuscatedGetter( intValue = 743073293 ) - @Export("__client_ns") static int __client_ns; @ObfuscatedName("sd") @ObfuscatedGetter( intValue = 944933439 ) - @Export("__client_sd") static int __client_sd; @ObfuscatedName("ru") @ObfuscatedSignature( signature = "Lhi;" ) - @Export("__client_ru") static PlayerAppearance __client_ru; @ObfuscatedName("qa") @ObfuscatedGetter( @@ -281,7 +259,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1605855913 ) - @Export("__client_sl") static int __client_sl; @ObfuscatedName("md") @ObfuscatedSignature( @@ -302,25 +279,21 @@ public final class Client extends GameShell implements Usernamed { @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; @ObfuscatedName("nr") - @Export("__client_nr") static int[] __client_nr; @ObfuscatedName("nv") @ObfuscatedGetter( intValue = -758575207 ) - @Export("__client_nv") static int __client_nv; @ObfuscatedName("nd") @ObfuscatedGetter( intValue = 760022015 ) - @Export("__client_nd") static int __client_nd; @ObfuscatedName("ni") @ObfuscatedGetter( intValue = 1990512261 ) - @Export("__client_ni") static int __client_ni; @ObfuscatedName("qe") @ObfuscatedSignature( @@ -341,13 +314,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 587773171 ) - @Export("__client_ph") static int __client_ph; @ObfuscatedName("pp") @ObfuscatedGetter( longValue = -1704358328771670975L ) - @Export("__client_pp") static long __client_pp; @ObfuscatedName("sk") @ObfuscatedSignature( @@ -359,22 +330,18 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lho;" ) - @Export("__client_mo") static Widget __client_mo; @ObfuscatedName("qf") @ObfuscatedGetter( intValue = 1365951359 ) - @Export("__client_qf") static int __client_qf; @ObfuscatedName("nh") @ObfuscatedGetter( intValue = -278874973 ) - @Export("__client_nh") static int __client_nh; @ObfuscatedName("rw") - @Export("__client_rw") static short __client_rw; @ObfuscatedName("qp") @ObfuscatedGetter( @@ -383,16 +350,12 @@ public final class Client extends GameShell implements Usernamed { @Export("soundEffectVolume") static int soundEffectVolume; @ObfuscatedName("rm") - @Export("__client_rm") static short __client_rm; @ObfuscatedName("rs") - @Export("__client_rs") static short __client_rs; @ObfuscatedName("rp") - @Export("__client_rp") static short __client_rp; @ObfuscatedName("ri") - @Export("__client_ri") static short __client_ri; @ObfuscatedName("pi") @ObfuscatedGetter( @@ -407,7 +370,6 @@ public final class Client extends GameShell implements Usernamed { @Export("viewportZoom") static int viewportZoom; @ObfuscatedName("rv") - @Export("__client_rv") static short __client_rv; @ObfuscatedName("ry") @ObfuscatedGetter( @@ -443,7 +405,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1694810089 ) - @Export("__client_mb") static int __client_mb; @ObfuscatedName("rr") @ObfuscatedGetter( @@ -461,16 +422,13 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -460406997 ) - @Export("__client_pm") static int __client_pm; @ObfuscatedName("pl") @ObfuscatedGetter( intValue = -1362734353 ) - @Export("__client_pl") static int __client_pl; @ObfuscatedName("rh") - @Export("__client_rh") static boolean[] __client_rh; @ObfuscatedName("ml") @ObfuscatedGetter( @@ -488,64 +446,49 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 206275573 ) - @Export("__client_sx") static int __client_sx; @ObfuscatedName("rd") - @Export("__client_rd") static int[] __client_rd; @ObfuscatedName("rl") - @Export("__client_rl") static int[] __client_rl; @ObfuscatedName("rj") - @Export("__client_rj") static int[] __client_rj; @ObfuscatedName("rk") - @Export("__client_rk") static int[] __client_rk; @ObfuscatedName("pn") - @Export("__client_pn") static int[] __client_pn; @ObfuscatedName("pq") - @Export("__client_pq") static int[] __client_pq; @ObfuscatedName("oh") @ObfuscatedSignature( signature = "Lje;" ) - @Export("__client_oh") static NodeDeque __client_oh; @ObfuscatedName("oc") @ObfuscatedSignature( signature = "Lje;" ) - @Export("__client_oc") static NodeDeque __client_oc; @ObfuscatedName("rb") - @Export("__client_rb") static short __client_rb; @ObfuscatedName("re") - @Export("__client_re") static short __client_re; @ObfuscatedName("mf") @ObfuscatedGetter( intValue = -1715020411 ) - @Export("__client_mf") static int __client_mf; @ObfuscatedName("pu") - @Export("__client_pu") static long[] __client_pu; @ObfuscatedName("ms") @ObfuscatedGetter( intValue = 2128395635 ) - @Export("__client_ms") static int __client_ms; @ObfuscatedName("nc") @ObfuscatedGetter( intValue = 344308849 ) - @Export("__client_nc") static int __client_nc; @ObfuscatedName("nf") @Export("changedSkills") @@ -557,13 +500,11 @@ public final class Client extends GameShell implements Usernamed { @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("mn") - @Export("__client_mn") static boolean __client_mn; @ObfuscatedName("pb") @ObfuscatedGetter( intValue = 1230692157 ) - @Export("__client_pb") static int __client_pb; @ObfuscatedName("nq") @ObfuscatedGetter( @@ -575,19 +516,15 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 535219347 ) - @Export("__client_mh") static int __client_mh; @ObfuscatedName("pz") - @Export("__client_pz") static String __client_pz; @ObfuscatedName("sj") @ObfuscatedSignature( signature = "Lbj;" ) - @Export("__client_sj") static OwnWorldComparator __client_sj; @ObfuscatedName("pv") - @Export("__client_pv") static int[] __client_pv; @ObfuscatedName("w") @ObfuscatedSignature( @@ -596,7 +533,6 @@ public final class Client extends GameShell implements Usernamed { @Export("collisionMaps") static CollisionMap[] collisionMaps; @ObfuscatedName("ai") - @Export("__client_ai") static boolean __client_ai; @ObfuscatedName("ba") @ObfuscatedGetter( @@ -635,7 +571,6 @@ public final class Client extends GameShell implements Usernamed { @Export("clientType") static int clientType; @ObfuscatedName("bl") - @Export("__client_bl") static boolean __client_bl; @ObfuscatedName("br") @ObfuscatedGetter( @@ -662,22 +597,18 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1731573291 ) - @Export("__client_cn") static int __client_cn; @ObfuscatedName("cq") @ObfuscatedGetter( intValue = -1313705721 ) - @Export("__client_cq") static int __client_cq; @ObfuscatedName("ch") @ObfuscatedGetter( longValue = -6574384275386813769L ) - @Export("__client_ch") static long __client_ch; @ObfuscatedName("cw") - @Export("__client_cw") static boolean __client_cw; @ObfuscatedName("cg") @Export("displayFps") @@ -764,7 +695,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1154760205 ) - @Export("__client_dp") static int __client_dp; @ObfuscatedName("ek") @ObfuscatedGetter( @@ -782,19 +712,16 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 755300107 ) - @Export("__client_ex") static int __client_ex; @ObfuscatedName("ej") @ObfuscatedGetter( intValue = -964416527 ) - @Export("__client_ej") static int __client_ej; @ObfuscatedName("el") @ObfuscatedGetter( intValue = 689094231 ) - @Export("__client_el") static int __client_el; @ObfuscatedName("en") @ObfuscatedSignature( @@ -805,7 +732,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -447055355 ) - @Export("__client_eo") static int __client_eo; @ObfuscatedName("ew") @Export("Login_isUsernameRemembered") @@ -817,7 +743,6 @@ public final class Client extends GameShell implements Usernamed { @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; @ObfuscatedName("ev") - @Export("__client_ev") static byte[] __client_ev; @ObfuscatedName("ez") @ObfuscatedSignature( @@ -838,10 +763,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 516059665 ) - @Export("__client_fw") static int __client_fw; @ObfuscatedName("fg") - @Export("__client_fg") static int[] __client_fg; @ObfuscatedName("fj") @ObfuscatedSignature( @@ -853,10 +776,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1050480853 ) - @Export("__client_fd") static int __client_fd; @ObfuscatedName("fh") - @Export("__client_fh") static boolean __client_fh; @ObfuscatedName("fx") @Export("useBufferedSocket") @@ -874,31 +795,26 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 829228151 ) - @Export("__client_fe") static int __client_fe; @ObfuscatedName("fn") @ObfuscatedGetter( intValue = -597100741 ) - @Export("__client_fn") static int __client_fn; @ObfuscatedName("fk") @ObfuscatedGetter( intValue = 8470625 ) - @Export("__client_fk") static int __client_fk; @ObfuscatedName("gp") @ObfuscatedGetter( intValue = 685418907 ) - @Export("__client_gp") static int __client_gp; @ObfuscatedName("gh") @ObfuscatedGetter( intValue = -1456975367 ) - @Export("__client_gh") static int __client_gh; @ObfuscatedName("gg") @Export("isInInstance") @@ -907,46 +823,38 @@ public final class Client extends GameShell implements Usernamed { @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; @ObfuscatedName("gd") - @Export("__client_gd") static final int[] __client_gd; @ObfuscatedName("gy") @ObfuscatedGetter( intValue = -134014371 ) - @Export("__client_gy") static int __client_gy; @ObfuscatedName("hx") @ObfuscatedGetter( intValue = -1406125895 ) - @Export("__client_hx") static int __client_hx; @ObfuscatedName("hn") @ObfuscatedGetter( intValue = -516933613 ) - @Export("__client_hn") static int __client_hn; @ObfuscatedName("hr") @ObfuscatedGetter( intValue = 1664350313 ) - @Export("__client_hr") static int __client_hr; @ObfuscatedName("hg") @ObfuscatedGetter( intValue = 1658018867 ) - @Export("__client_hg") static int __client_hg; @ObfuscatedName("hh") - @Export("__client_hh") static boolean __client_hh; @ObfuscatedName("hd") @ObfuscatedGetter( intValue = 438998245 ) - @Export("__client_hd") static int __client_hd; @ObfuscatedName("hw") @ObfuscatedGetter( @@ -964,25 +872,21 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 218086227 ) - @Export("__client_hv") static int __client_hv; @ObfuscatedName("hu") @ObfuscatedGetter( intValue = -480633777 ) - @Export("__client_hu") static int __client_hu; @ObfuscatedName("hi") @ObfuscatedGetter( intValue = 402871301 ) - @Export("__client_hi") static int __client_hi; @ObfuscatedName("ht") @ObfuscatedGetter( intValue = 1502058429 ) - @Export("__client_ht") static int __client_ht; @ObfuscatedName("hj") @ObfuscatedGetter( @@ -1000,19 +904,16 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -441913785 ) - @Export("__client_hc") static int __client_hc; @ObfuscatedName("hk") @ObfuscatedGetter( intValue = -1149138989 ) - @Export("__client_hk") static int __client_hk; @ObfuscatedName("if") @ObfuscatedGetter( intValue = -952172003 ) - @Export("__client_if") static int __client_if; @ObfuscatedName("ie") @ObfuscatedGetter( @@ -1024,31 +925,25 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 351193663 ) - @Export("__client_in") static int __client_in; @ObfuscatedName("il") @ObfuscatedGetter( intValue = -1063713523 ) - @Export("__client_il") public static int __client_il; @ObfuscatedName("ij") - @Export("__client_ij") static boolean __client_ij; @ObfuscatedName("iy") @ObfuscatedGetter( intValue = -1213062413 ) - @Export("__client_iy") static int __client_iy; @ObfuscatedName("is") - @Export("__client_is") static boolean __client_is; @ObfuscatedName("ik") @ObfuscatedGetter( intValue = 910983131 ) - @Export("__client_ik") static int __client_ik; @ObfuscatedName("ir") @ObfuscatedGetter( @@ -1141,13 +1036,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1691923909 ) - @Export("__client_ju") static int __client_ju; @ObfuscatedName("jz") @ObfuscatedGetter( intValue = -1267243587 ) - @Export("__client_jz") static int __client_jz; @ObfuscatedName("jp") @ObfuscatedGetter( @@ -1159,13 +1052,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 813973829 ) - @Export("__client_ja") static int __client_ja; @ObfuscatedName("je") @ObfuscatedGetter( intValue = 1959822241 ) - @Export("__client_je") static int __client_je; @ObfuscatedName("jy") @ObfuscatedGetter( @@ -1174,7 +1065,6 @@ public final class Client extends GameShell implements Usernamed { @Export("dragItemSlotDestination") static int dragItemSlotDestination; @ObfuscatedName("jl") - @Export("__client_jl") static boolean __client_jl; @ObfuscatedName("jt") @ObfuscatedGetter( @@ -1186,7 +1076,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1084498299 ) - @Export("__client_jc") static int __client_jc; @ObfuscatedName("jj") @Export("showLoadingMessages") @@ -1207,7 +1096,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -836962805 ) - @Export("__client_jo") static int __client_jo; @ObfuscatedName("js") @Export("renderSelf") @@ -1216,16 +1104,13 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1208823721 ) - @Export("__client_ke") static int __client_ke; @ObfuscatedName("ky") @ObfuscatedGetter( intValue = -64320473 ) - @Export("__client_ky") static int __client_ky; @ObfuscatedName("kd") - @Export("__client_kd") static int[] __client_kd; @ObfuscatedName("kp") @Export("playerMenuOpcodes") @@ -1237,7 +1122,6 @@ public final class Client extends GameShell implements Usernamed { @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; @ObfuscatedName("kn") - @Export("__client_kn") static int[] __client_kn; @ObfuscatedName("kx") @ObfuscatedGetter( @@ -1255,7 +1139,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( signature = "Lje;" ) - @Export("__client_kh") static NodeDeque __client_kh; @ObfuscatedName("kk") @ObfuscatedSignature( @@ -1282,7 +1165,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -898263359 ) - @Export("__client_ku") static int __client_ku; @ObfuscatedName("kc") @Export("isMenuOpen") @@ -1330,25 +1212,21 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 26099827 ) - @Export("__client_lq") static int __client_lq; @ObfuscatedName("ln") @ObfuscatedGetter( intValue = 885052255 ) - @Export("__client_ln") static int __client_ln; @ObfuscatedName("lb") @ObfuscatedGetter( intValue = 699084605 ) - @Export("__client_lb") static int __client_lb; @ObfuscatedName("ls") @ObfuscatedGetter( intValue = -274968037 ) - @Export("__client_ls") static int __client_ls; @ObfuscatedName("lz") @ObfuscatedGetter( @@ -1363,7 +1241,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 196309625 ) - @Export("__client_lc") static int __client_lc; static { @@ -1663,6 +1540,7 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "1297880469" ) + @Export("setUp") protected final void setUp() { WorldMapCacheName.method633(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); class2.port1 = gameBuild == 0?43594:worldId + 40000; @@ -2715,6 +2593,7 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "-1879956387" ) + @Export("kill0") protected final void kill0() { if(class196.varcs.hasUnwrittenChanges()) { class196.varcs.write(); @@ -4637,7 +4516,6 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "-1792846917" ) - @Export("__ge_137") void __ge_137() { int var1 = SoundCache.canvasWidth; int var2 = Huffman.canvasHeight; @@ -4855,7 +4733,6 @@ public final class Client extends GameShell implements Usernamed { signature = "(Lcl;I)Z", garbageValue = "1488446149" ) - @Export("__hg_138") final boolean __hg_138(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; @@ -6223,7 +6100,6 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "-387903382" ) - @Export("__hi_139") final void __hi_139() { boolean var1 = false; @@ -6439,7 +6315,6 @@ public final class Client extends GameShell implements Usernamed { signature = "(ZI)V", garbageValue = "-271438207" ) - @Export("__iu_141") final void __iu_141(boolean var1) { int var2 = rootWidgetGroup; int var3 = SoundCache.canvasWidth; @@ -6477,7 +6352,6 @@ public final class Client extends GameShell implements Usernamed { signature = "(I)V", garbageValue = "715978124" ) - @Export("__jh_142") final void __jh_142() { class22.method295(clickedWidget); ++MouseRecorder.widgetDragDuration; @@ -6594,6 +6468,7 @@ public final class Client extends GameShell implements Usernamed { signature = "(B)Lkp;", garbageValue = "-87" ) + @Export("username") public Username username() { return Canvas.localPlayer != null?Canvas.localPlayer.username:null; } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 7745a7e89c..cf9ef3997d 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -11,607 +11,506 @@ public class ClientPacket implements ClientPacketMarker { @ObfuscatedGetter( intValue = 1076448827 ) - @Export("__gs_qh") static int __gs_qh; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_m") public static final ClientPacket __gs_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_f") public static final ClientPacket __gs_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_q") public static final ClientPacket __gs_q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_w") public static final ClientPacket __gs_w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_o") public static final ClientPacket __gs_o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_u") public static final ClientPacket __gs_u; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_g") public static final ClientPacket __gs_g; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_l") public static final ClientPacket __gs_l; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_e") public static final ClientPacket __gs_e; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_x") public static final ClientPacket __gs_x; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_d") public static final ClientPacket __gs_d; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_k") public static final ClientPacket __gs_k; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_n") public static final ClientPacket __gs_n; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_i") public static final ClientPacket __gs_i; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_a") public static final ClientPacket __gs_a; @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_z") public static final ClientPacket __gs_z; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_j") public static final ClientPacket __gs_j; @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_s") public static final ClientPacket __gs_s; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_t") public static final ClientPacket __gs_t; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_y") public static final ClientPacket __gs_y; @ObfuscatedName("h") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_h") public static final ClientPacket __gs_h; @ObfuscatedName("b") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_b") public static final ClientPacket __gs_b; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_c") public static final ClientPacket __gs_c; @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_r") public static final ClientPacket __gs_r; @ObfuscatedName("p") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_p") public static final ClientPacket __gs_p; @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_v") public static final ClientPacket __gs_v; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ag") public static final ClientPacket __gs_ag; @ObfuscatedName("aq") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_aq") public static final ClientPacket __gs_aq; @ObfuscatedName("aj") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_aj") public static final ClientPacket __gs_aj; @ObfuscatedName("av") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_av") public static final ClientPacket __gs_av; @ObfuscatedName("ar") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ar") public static final ClientPacket __gs_ar; @ObfuscatedName("ac") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ac") public static final ClientPacket __gs_ac; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ay") public static final ClientPacket __gs_ay; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ah") public static final ClientPacket __gs_ah; @ObfuscatedName("ak") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ak") public static final ClientPacket __gs_ak; @ObfuscatedName("aw") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_aw") public static final ClientPacket __gs_aw; @ObfuscatedName("al") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_al") public static final ClientPacket __gs_al; @ObfuscatedName("ab") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ab") public static final ClientPacket __gs_ab; @ObfuscatedName("ae") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ae") public static final ClientPacket __gs_ae; @ObfuscatedName("at") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_at") public static final ClientPacket __gs_at; @ObfuscatedName("ad") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ad") public static final ClientPacket __gs_ad; @ObfuscatedName("ap") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ap") public static final ClientPacket __gs_ap; @ObfuscatedName("as") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_as") public static final ClientPacket __gs_as; @ObfuscatedName("am") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_am") static final ClientPacket __gs_am; @ObfuscatedName("an") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_an") public static final ClientPacket __gs_an; @ObfuscatedName("az") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_az") public static final ClientPacket __gs_az; @ObfuscatedName("au") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_au") public static final ClientPacket __gs_au; @ObfuscatedName("ao") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ao") public static final ClientPacket __gs_ao; @ObfuscatedName("aa") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_aa") public static final ClientPacket __gs_aa; @ObfuscatedName("ax") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ax") public static final ClientPacket __gs_ax; @ObfuscatedName("af") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_af") public static final ClientPacket __gs_af; @ObfuscatedName("ai") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ai") public static final ClientPacket __gs_ai; @ObfuscatedName("ba") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ba") public static final ClientPacket __gs_ba; @ObfuscatedName("bb") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bb") public static final ClientPacket __gs_bb; @ObfuscatedName("bs") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bs") public static final ClientPacket __gs_bs; @ObfuscatedName("bq") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bq") public static final ClientPacket __gs_bq; @ObfuscatedName("bn") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bn") public static final ClientPacket __gs_bn; @ObfuscatedName("bk") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bk") public static final ClientPacket __gs_bk; @ObfuscatedName("bd") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bd") public static final ClientPacket __gs_bd; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bc") public static final ClientPacket __gs_bc; @ObfuscatedName("bo") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bo") public static final ClientPacket __gs_bo; @ObfuscatedName("bx") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bx") public static final ClientPacket __gs_bx; @ObfuscatedName("by") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_by") public static final ClientPacket __gs_by; @ObfuscatedName("bu") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bu") public static final ClientPacket __gs_bu; @ObfuscatedName("bm") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bm") public static final ClientPacket __gs_bm; @ObfuscatedName("bl") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bl") public static final ClientPacket __gs_bl; @ObfuscatedName("br") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_br") public static final ClientPacket __gs_br; @ObfuscatedName("bj") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bj") public static final ClientPacket __gs_bj; @ObfuscatedName("bi") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bi") public static final ClientPacket __gs_bi; @ObfuscatedName("bz") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bz") public static final ClientPacket __gs_bz; @ObfuscatedName("bg") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bg") public static final ClientPacket __gs_bg; @ObfuscatedName("bt") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bt") public static final ClientPacket __gs_bt; @ObfuscatedName("bp") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bp") public static final ClientPacket __gs_bp; @ObfuscatedName("bf") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bf") public static final ClientPacket __gs_bf; @ObfuscatedName("bh") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bh") public static final ClientPacket __gs_bh; @ObfuscatedName("be") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_be") public static final ClientPacket __gs_be; @ObfuscatedName("bv") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bv") public static final ClientPacket __gs_bv; @ObfuscatedName("bw") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_bw") public static final ClientPacket __gs_bw; @ObfuscatedName("cr") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cr") public static final ClientPacket __gs_cr; @ObfuscatedName("cv") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cv") public static final ClientPacket __gs_cv; @ObfuscatedName("ce") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ce") public static final ClientPacket __gs_ce; @ObfuscatedName("cy") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cy") public static final ClientPacket __gs_cy; @ObfuscatedName("cs") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cs") public static final ClientPacket __gs_cs; @ObfuscatedName("cm") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cm") public static final ClientPacket __gs_cm; @ObfuscatedName("cj") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cj") public static final ClientPacket __gs_cj; @ObfuscatedName("cu") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cu") public static final ClientPacket __gs_cu; @ObfuscatedName("cb") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cb") public static final ClientPacket __gs_cb; @ObfuscatedName("ck") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ck") public static final ClientPacket __gs_ck; @ObfuscatedName("cn") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cn") public static final ClientPacket __gs_cn; @ObfuscatedName("cq") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cq") public static final ClientPacket __gs_cq; @ObfuscatedName("ch") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ch") public static final ClientPacket __gs_ch; @ObfuscatedName("cw") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cw") public static final ClientPacket __gs_cw; @ObfuscatedName("cg") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cg") public static final ClientPacket __gs_cg; @ObfuscatedName("cf") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cf") public static final ClientPacket __gs_cf; @ObfuscatedName("cp") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cp") public static final ClientPacket __gs_cp; @ObfuscatedName("cl") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cl") public static final ClientPacket __gs_cl; @ObfuscatedName("ct") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ct") public static final ClientPacket __gs_ct; @ObfuscatedName("cz") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cz") public static final ClientPacket __gs_cz; @ObfuscatedName("cc") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_cc") public static final ClientPacket __gs_cc; @ObfuscatedName("ci") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__gs_ci") static final ClientPacket __gs_ci; @ObfuscatedName("cd") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java index 6ca10198ab..19961d5bed 100644 --- a/runescape-client/src/main/java/ClientParameter.java +++ b/runescape-client/src/main/java/ClientParameter.java @@ -16,121 +16,101 @@ public class ClientParameter { @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_m") static final ClientParameter __ji_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_f") static final ClientParameter __ji_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_q") static final ClientParameter __ji_q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_w") static final ClientParameter __ji_w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_o") static final ClientParameter __ji_o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_u") static final ClientParameter __ji_u; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_g") static final ClientParameter __ji_g; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_l") static final ClientParameter __ji_l; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_e") static final ClientParameter __ji_e; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_x") static final ClientParameter __ji_x; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_d") static final ClientParameter __ji_d; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_k") static final ClientParameter __ji_k; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_n") public static final ClientParameter __ji_n; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_i") public static final ClientParameter __ji_i; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_a") static final ClientParameter __ji_a; @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_z") static final ClientParameter __ji_z; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_j") static final ClientParameter __ji_j; @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_s") static final ClientParameter __ji_s; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lji;" ) - @Export("__ji_t") static final ClientParameter __ji_t; @ObfuscatedName("fp") @ObfuscatedSignature( signature = "Lfu;" ) - @Export("__ji_fp") static AbstractSocket __ji_fp; @ObfuscatedName("y") @Export("id") diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index fdde50a4f3..33ece76295 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -14,7 +14,6 @@ public class ClientPreferences { @ObfuscatedGetter( intValue = 1548448409 ) - @Export("__bf_m") static int __bf_m; @ObfuscatedName("gr") @ObfuscatedSignature( @@ -110,7 +109,6 @@ public class ClientPreferences { signature = "(ZI)V", garbageValue = "1213718182" ) - @Export("__m_150") void __m_150(boolean var1) { } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 7d335a8657..a55c80bc1b 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -68,7 +68,6 @@ public class CollisionMap { signature = "(IIIIZB)V", garbageValue = "2" ) - @Export("__f_283") public void __f_283(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; @@ -221,7 +220,6 @@ public class CollisionMap { signature = "(IIIIZI)V", garbageValue = "1813281219" ) - @Export("__q_284") public void __q_284(int var1, int var2, int var3, int var4, boolean var5) { int var6 = 256; if(var5) { @@ -248,7 +246,6 @@ public class CollisionMap { signature = "(III)V", garbageValue = "1082834717" ) - @Export("__w_285") public void __w_285(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; @@ -260,7 +257,6 @@ public class CollisionMap { signature = "(III)V", garbageValue = "2022671149" ) - @Export("__o_286") public void __o_286(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; @@ -272,7 +268,6 @@ public class CollisionMap { signature = "(IIII)V", garbageValue = "953350100" ) - @Export("__u_287") void __u_287(int var1, int var2, int var3) { this.flags[var1][var2] |= var3; } @@ -282,7 +277,6 @@ public class CollisionMap { signature = "(IIIIZB)V", garbageValue = "54" ) - @Export("__g_288") public void __g_288(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; @@ -435,7 +429,6 @@ public class CollisionMap { signature = "(IIIIIZB)V", garbageValue = "23" ) - @Export("__l_289") public void __l_289(int var1, int var2, int var3, int var4, int var5, boolean var6) { int var7 = 256; if(var6) { @@ -468,7 +461,6 @@ public class CollisionMap { signature = "(IIII)V", garbageValue = "52290294" ) - @Export("__e_290") void __e_290(int var1, int var2, int var3) { this.flags[var1][var2] &= ~var3; } @@ -478,7 +470,6 @@ public class CollisionMap { signature = "(IIB)V", garbageValue = "37" ) - @Export("__x_291") public void __x_291(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index c99809fbaf..b04a824018 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -1,4 +1,5 @@ import java.util.Random; +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,6 +12,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { signature = "(I)Llb;", garbageValue = "-843739713" ) + @Export("get") public PlatformInfo get() { byte var1; if(WorldMapSection3.osNameLowerCase.startsWith("win")) { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 35d3383bd7..91034e8a5c 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -26,6 +26,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { signature = "(B)Lco;", garbageValue = "-49" ) + @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 546bc285e8..0bf9f0d78a 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -16,6 +16,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { signature = "(I)[B", garbageValue = "-1219910462" ) + @Export("get") byte[] get() { byte[] var1 = new byte[this.directBuffer.capacity()]; this.directBuffer.position(0); @@ -28,6 +29,7 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { signature = "([BI)V", garbageValue = "-2034091753" ) + @Export("set") void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); this.directBuffer.position(0); diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index cf3f5cab78..64bb73c154 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -15,11 +15,13 @@ public class DirectWrapper extends Wrapper { } @ObfuscatedName("m") + @Export("get") Object get() { return this.obj; } @ObfuscatedName("f") + @Export("isSoft") boolean isSoft() { return false; } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 98cfafac12..af0b3ff97a 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -107,6 +107,7 @@ public class DynamicObject extends Entity { signature = "(I)Ldu;", garbageValue = "-2134947096" ) + @Export("getModel") protected final Model getModel() { if(this.sequenceDefinition != null) { int var1 = Client.cycle - this.cycleStart; diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 9667cfd0d9..65f99d25ad 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.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,5 +11,6 @@ public interface Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") int rsOrdinal(); } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 0201ac4f50..c655b8180b 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -10,7 +10,6 @@ public final class EvictingDualNodeHashTable { @ObfuscatedSignature( signature = "Lfn;" ) - @Export("__m") DualNode __m; @ObfuscatedName("f") @Export("capacity") diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index c301844a78..88ab031bd5 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -14,31 +14,26 @@ public class FaceNormal { @ObfuscatedGetter( intValue = 422473713 ) - @Export("__el_x") public static int __el_x; @ObfuscatedName("gm") @ObfuscatedSignature( signature = "Lln;" ) - @Export("__el_gm") static Sprite __el_gm; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -2074333261 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1376860893 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2619977 ) - @Export("__q") int __q; @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 57d955d98c..55ef8f5fe3 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -13,6 +14,7 @@ public final class Font extends AbstractFont { } @ObfuscatedName("m") + @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; int var8 = Rasterizer2D.Rasterizer2D_width - var4; @@ -54,6 +56,7 @@ public final class Font extends AbstractFont { } @ObfuscatedName("f") + @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; int var9 = Rasterizer2D.Rasterizer2D_width - var4; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index e6996f3685..89099885cc 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -43,7 +43,6 @@ public class FontName { @Export("FontName_verdana15") public static final FontName FontName_verdana15; @ObfuscatedName("g") - @Export("__g") String __g; static { @@ -78,6 +77,7 @@ public class FontName { signature = "(I)V", garbageValue = "-1587423260" ) + @Export("closeWorldSelect") static void closeWorldSelect() { Login.worldSelectOpen = false; Login.leftTitleSprite.drawAt(Login.xPadding, 0); diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index fcb36dfb17..98f2077878 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -14,7 +14,6 @@ public class Fonts { @Export("indexStore255") static IndexStore indexStore255; @ObfuscatedName("o") - @Export("__kz_o") static byte[][][] __kz_o; @ObfuscatedName("l") @ObfuscatedSignature( @@ -26,13 +25,11 @@ public class Fonts { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__m") AbstractIndexCache __m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__f") AbstractIndexCache __f; @ObfuscatedName("q") @Export("map") diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 554a403061..1a656b9e0a 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Formatting") public class Formatting { @ObfuscatedName("d") - @Export("__cy_d") static int[] __cy_d; @ObfuscatedName("dh") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 7fb5401ec7..946be4825c 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -11,10 +11,8 @@ public class Friend extends Buddy { @Export("soundSystemExecutor") static ScheduledExecutorService soundSystemExecutor; @ObfuscatedName("m") - @Export("__m") boolean __m; @ObfuscatedName("f") - @Export("__f") boolean __f; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 950f6b6589..8745b5bdc2 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -11,7 +11,6 @@ public class FriendLoginUpdate extends Link { @ObfuscatedSignature( signature = "Ley;" ) - @Export("__kn_x") static UrlRequest __kn_x; @ObfuscatedName("q") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index eddea33e3f..908cc6f100 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -29,7 +29,6 @@ public class FriendSystem { @ObfuscatedGetter( intValue = 1477282369 ) - @Export("__g") int __g; @ObfuscatedSignature( @@ -47,7 +46,6 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "-114" ) - @Export("__m_151") boolean __m_151() { return this.__g == 2; } @@ -57,7 +55,6 @@ public class FriendSystem { signature = "(I)V", garbageValue = "-2125539725" ) - @Export("__f_152") final void __f_152() { this.__g = 1; } @@ -67,7 +64,6 @@ public class FriendSystem { signature = "(Lgr;II)V", garbageValue = "-1440726810" ) - @Export("__q_153") final void __q_153(Buffer var1, int var2) { this.friendsList.read(var1, var2); this.__g = 2; @@ -79,7 +75,6 @@ public class FriendSystem { signature = "(I)V", garbageValue = "-1408945788" ) - @Export("__w_154") final void __w_154() { for(FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__f_438(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__q_439()) { if((long)var1.time < class203.currentTimeMs() / 1000L - 5L) { @@ -134,7 +129,6 @@ public class FriendSystem { signature = "(Ljava/lang/String;I)V", garbageValue = "-1721017960" ) - @Export("__l_157") final void __l_157(String var1) { if(var1 != null) { Username var2 = new Username(var1, this.loginType); @@ -179,7 +173,6 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "57" ) - @Export("__e_158") final boolean __e_158() { return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.__client_jo != 1; } @@ -189,7 +182,6 @@ public class FriendSystem { signature = "(Ljava/lang/String;B)V", garbageValue = "30" ) - @Export("__x_159") final void __x_159(String var1) { if(var1 != null) { Username var2 = new Username(var1, this.loginType); @@ -228,7 +220,6 @@ public class FriendSystem { signature = "(B)Z", garbageValue = "120" ) - @Export("__a_160") final boolean __a_160() { return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.__client_jo != 1; } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index e8832d1c43..b39fda53a7 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -17,7 +17,6 @@ public class FriendsList extends UserList { @ObfuscatedGetter( intValue = -217526077 ) - @Export("__x") int __x; @ObfuscatedName("d") @ObfuscatedSignature( @@ -41,6 +40,7 @@ public class FriendsList extends UserList { signature = "(I)Ljs;", garbageValue = "-2063112195" ) + @Export("newInstance") User newInstance() { return new Friend(); } @@ -50,6 +50,7 @@ public class FriendsList extends UserList { signature = "(II)[Ljs;", garbageValue = "861814350" ) + @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 85f50711d9..8bb9660616 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -17,7 +17,6 @@ public final class GameObject { @ObfuscatedGetter( intValue = -457229589 ) - @Export("__eh_fy") static int __eh_fy; @ObfuscatedName("m") @ObfuscatedGetter( @@ -83,7 +82,6 @@ public final class GameObject { @ObfuscatedGetter( intValue = 1941106389 ) - @Export("__d") int __d; @ObfuscatedName("k") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 0fb0767d13..dad3bf2500 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -43,7 +43,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedGetter( intValue = -281664295 ) - @Export("__ba_q") static int __ba_q; @ObfuscatedName("o") @ObfuscatedGetter( @@ -58,19 +57,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedGetter( intValue = -1179083285 ) - @Export("__ba_l") static int __ba_l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1698831905 ) - @Export("__ba_e") static int __ba_e; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 425367827 ) - @Export("__ba_d") static int __ba_d; @ObfuscatedName("k") @ObfuscatedGetter( @@ -79,22 +75,18 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("fps") protected static int fps; @ObfuscatedName("a") - @Export("__ba_a") static long[] __ba_a; @ObfuscatedName("j") - @Export("__ba_j") static long[] __ba_j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -2078849253 ) - @Export("__ba_s") static int __ba_s; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = -1042005999 ) - @Export("__ba_aw") static int __ba_aw; @ObfuscatedName("an") @Export("hasFocus") @@ -175,7 +167,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @Export("canvas") java.awt.Canvas canvas; @ObfuscatedName("ah") - @Export("__ah") volatile boolean __ah; @ObfuscatedName("al") @Export("resizeCanvasNextFrame") @@ -405,7 +396,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "-1773624745" ) - @Export("__j_113") protected abstract void __j_113(); @ObfuscatedName("p") @@ -613,7 +603,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(B)V", garbageValue = "0" ) - @Export("__av_93") void __av_93() { long var1 = class203.currentTimeMs(); long var3 = __ba_j[__ba_s]; @@ -635,7 +624,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(B)V", garbageValue = "-2" ) - @Export("__ar_94") void __ar_94() { Container var1 = this.container(); long var2 = class203.currentTimeMs(); @@ -678,7 +666,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "-1999661001" ) - @Export("__ac_95") final void __ac_95() { Bounds var1 = this.getFrameContentBounds(); if(var1.__q != this.contentWidth || this.contentHeight != var1.__w || this.resizeCanvasNextFrame) { @@ -693,7 +680,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1147427427" ) - @Export("__ay_96") final void __ay_96() { this.resizeCanvasNextFrame = true; } @@ -753,7 +739,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1445885427" ) - @Export("__al_111") protected abstract void __al_111(); @ObfuscatedName("ab") @@ -833,7 +818,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "-1283386969" ) - @Export("__ad_108") protected final void __ad_108() { PlayerType.__ij_ak = null; class231.__hb_av = null; @@ -904,10 +888,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(I)V", garbageValue = "1860808291" ) - @Export("__au_110") protected abstract void __au_110(); - @Export("__destroy_99") @ObfuscatedName("destroy") public final void __destroy_99() { if(this == gameShell && !isKilled) { @@ -993,7 +975,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.kill(); } - @Export("__start_97") @ObfuscatedName("start") public final void __start_97() { if(this == gameShell && !isKilled) { @@ -1040,11 +1021,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void windowOpened(WindowEvent var1) { } - @Export("__init_109") @ObfuscatedName("init") public abstract void __init_109(); - @Export("__stop_98") @ObfuscatedName("stop") public final void __stop_98() { if(this == gameShell && !isKilled) { diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 023a265615..07f41da157 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -17,7 +17,6 @@ public class GrandExchangeEvent { @ObfuscatedGetter( longValue = -6503890758391257651L ) - @Export("__f") public final long __f; @ObfuscatedName("q") @ObfuscatedSignature( @@ -57,7 +56,6 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "1672323214" ) - @Export("__m_3") public String __m_3() { return this.string1; } @@ -67,7 +65,6 @@ public class GrandExchangeEvent { signature = "(I)Ljava/lang/String;", garbageValue = "-271438207" ) - @Export("__f_4") public String __f_4() { return this.string2; } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 456dcb0691..fba00b388a 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -12,22 +12,17 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("GrandExchangeEvents") public class GrandExchangeEvents { @ObfuscatedName("f") - @Export("__g_f") public static Comparator __g_f; @ObfuscatedName("q") - @Export("__g_q") public static Comparator __g_q; @ObfuscatedName("w") - @Export("__g_w") public static Comparator __g_w; @ObfuscatedName("o") - @Export("__g_o") public static Comparator __g_o; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1605454211 ) - @Export("__g_z") static int __g_z; @ObfuscatedName("hs") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 93636a2511..07df2e51e1 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -12,7 +12,6 @@ public class GrandExchangeOffer { @ObfuscatedGetter( intValue = -1286287981 ) - @Export("__x_rg") static int __x_rg; @ObfuscatedName("l") @ObfuscatedGetter( @@ -95,7 +94,6 @@ public class GrandExchangeOffer { signature = "(II)V", garbageValue = "1339285061" ) - @Export("__o_9") void __o_9(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); @@ -106,7 +104,6 @@ public class GrandExchangeOffer { signature = "(II)V", garbageValue = "743094900" ) - @Export("__u_10") void __u_10(int var1) { this.state &= -9; if(var1 == 1) { diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 19433596b2..e717317aa6 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -11,7 +11,6 @@ public final class GraphicsObject extends Entity { @ObfuscatedGetter( intValue = -1807262579 ) - @Export("__bw_d") static int __bw_d; @ObfuscatedName("k") @ObfuscatedSignature( @@ -130,6 +129,7 @@ public final class GraphicsObject extends Entity { signature = "(I)Ldu;", garbageValue = "-2134947096" ) + @Export("getModel") protected final Model getModel() { SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id); Model var2; diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java index 223075772e..515facdfdb 100644 --- a/runescape-client/src/main/java/GroundItem.java +++ b/runescape-client/src/main/java/GroundItem.java @@ -25,6 +25,7 @@ public final class GroundItem extends Entity { signature = "(I)Ldu;", garbageValue = "-2134947096" ) + @Export("getModel") protected final Model getModel() { return Skills.getItemDefinition(this.id).getModel(this.quantity); } diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java index 1e2fb1a529..26ba4cbf74 100644 --- a/runescape-client/src/main/java/GzipDecompressor.java +++ b/runescape-client/src/main/java/GzipDecompressor.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("GzipDecompressor") public class GzipDecompressor { @ObfuscatedName("ck") - @Export("__go_ck") public static char __go_ck; @ObfuscatedName("m") @Export("inflater") diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 80128ffc07..b147b45c00 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -11,13 +11,11 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__ii_m") public static AbstractIndexCache __ii_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__ii_f") public static AbstractIndexCache __ii_f; @ObfuscatedName("q") @ObfuscatedSignature( @@ -41,7 +39,6 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedGetter( intValue = 1515955705 ) - @Export("__o") public int __o; @ObfuscatedName("l") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index a94f19236a..961a1c899c 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -11,19 +11,16 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jm_m") static AbstractIndexCache __jm_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jm_f") static AbstractIndexCache __jm_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jm_q") static AbstractIndexCache __jm_q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -35,7 +32,6 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - @Export("__jm_o") static EvictingDualNodeHashTable __jm_o; @ObfuscatedName("u") @ObfuscatedSignature( @@ -58,64 +54,53 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedGetter( intValue = -102270561 ) - @Export("__i") public int __i; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1533306389 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1677628889 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 1683792491 ) - @Export("__j") int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1845590719 ) - @Export("__s") int __s; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -389283589 ) - @Export("__t") public int __t; @ObfuscatedName("y") @ObfuscatedGetter( intValue = 1751286975 ) - @Export("__y") public int __y; @ObfuscatedName("h") @ObfuscatedGetter( intValue = 199815415 ) - @Export("__h") public int __h; @ObfuscatedName("b") - @Export("__b") String __b; @ObfuscatedName("c") @ObfuscatedGetter( intValue = 1003116765 ) - @Export("__c") public int __c; @ObfuscatedName("r") @ObfuscatedGetter( intValue = 1498880475 ) - @Export("__r") public int __r; @ObfuscatedName("p") @Export("transforms") @@ -291,7 +276,6 @@ public class HitSplatDefinition extends DualNode { signature = "(I)Lln;", garbageValue = "-1692599381" ) - @Export("__g_417") public Sprite __g_417() { if(this.__a < 0) { return null; @@ -315,7 +299,6 @@ public class HitSplatDefinition extends DualNode { signature = "(B)Lln;", garbageValue = "-15" ) - @Export("__l_418") public Sprite __l_418() { if(this.__z < 0) { return null; @@ -339,7 +322,6 @@ public class HitSplatDefinition extends DualNode { signature = "(B)Lln;", garbageValue = "-49" ) - @Export("__e_419") public Sprite __e_419() { if(this.__j < 0) { return null; @@ -363,7 +345,6 @@ public class HitSplatDefinition extends DualNode { signature = "(I)Lln;", garbageValue = "393569067" ) - @Export("__x_420") public Sprite __x_420() { if(this.__s < 0) { return null; diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 4561d9a722..cf37ace67f 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Huffman") public class Huffman { @ObfuscatedName("e") - @Export("__gd_e") static int[][] __gd_e; @ObfuscatedName("p") @ObfuscatedGetter( @@ -17,13 +16,10 @@ public class Huffman { @Export("canvasHeight") public static int canvasHeight; @ObfuscatedName("m") - @Export("__m") int[] __m; @ObfuscatedName("f") - @Export("__f") byte[] __f; @ObfuscatedName("q") - @Export("__q") int[] __q; public Huffman(byte[] var1) { @@ -114,7 +110,6 @@ public class Huffman { signature = "([BII[BIB)I", garbageValue = "64" ) - @Export("__m_293") public int __m_293(byte[] var1, int var2, int var3, byte[] var4, int var5) { int var6 = 0; int var7 = var5 << 3; @@ -165,7 +160,6 @@ public class Huffman { signature = "([BI[BIII)I", garbageValue = "-2094399899" ) - @Export("__f_294") public int __f_294(byte[] var1, int var2, byte[] var3, int var4, int var5) { if(var5 == 0) { return 0; diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 17bef395e7..3257e5fa90 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -26,6 +26,7 @@ public class IgnoreList extends UserList { signature = "(I)Ljs;", garbageValue = "-2063112195" ) + @Export("newInstance") User newInstance() { return new Ignored(); } @@ -35,6 +36,7 @@ public class IgnoreList extends UserList { signature = "(II)[Ljs;", garbageValue = "861814350" ) + @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 1c70dd66cf..87c2827f60 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Ignored") public class Ignored extends User { @ObfuscatedName("at") - @Export("__ks_at") protected static String __ks_at; @ObfuscatedName("m") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/IndexCache.java index 763775a166..6f39f6bf7b 100644 --- a/runescape-client/src/main/java/IndexCache.java +++ b/runescape-client/src/main/java/IndexCache.java @@ -30,10 +30,8 @@ public class IndexCache extends AbstractIndexCache { @Export("index") int index; @ObfuscatedName("v") - @Export("__v") volatile boolean __v; @ObfuscatedName("ag") - @Export("__ag") boolean __ag; @ObfuscatedName("aq") @Export("validArchives") @@ -54,7 +52,6 @@ public class IndexCache extends AbstractIndexCache { @ObfuscatedGetter( intValue = -1884661133 ) - @Export("__ac") int __ac; static { @@ -106,6 +103,7 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)I", garbageValue = "-1809769865" ) + @Export("archiveLoadPercent") int archiveLoadPercent(int var1) { return super.archives[var1] != null?100:(this.validArchives[var1]?100:class54.method1086(this.index, var1)); } @@ -115,6 +113,7 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)V", garbageValue = "-1829145107" ) + @Export("loadArchive") void loadArchive(int var1) { if(this.indexStore != null && this.validArchives != null && this.validArchives[var1]) { IndexStore var2 = this.indexStore; @@ -146,7 +145,6 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)Z", garbageValue = "1750279412" ) - @Export("__cx_404") public boolean __cx_404() { return this.__v; } @@ -156,7 +154,6 @@ public class IndexCache extends AbstractIndexCache { signature = "(I)I", garbageValue = "1671499504" ) - @Export("__ca_405") public int __ca_405() { if(this.__v) { return 100; @@ -357,7 +354,6 @@ public class IndexCache extends AbstractIndexCache { signature = "(IB)Z", garbageValue = "0" ) - @Export("__dn_407") public boolean __dn_407(int var1) { return this.validArchives[var1]; } @@ -367,7 +363,6 @@ public class IndexCache extends AbstractIndexCache { signature = "(II)Z", garbageValue = "1419648188" ) - @Export("__df_408") public boolean __df_408(int var1) { return this.__j_395(var1) != null; } diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java index 9003278964..352fa614f5 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/IndexCacheLoader.java @@ -19,13 +19,11 @@ public class IndexCacheLoader { @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; @ObfuscatedName("x") - @Export("__bd_x") public static short[][] __bd_x; @ObfuscatedName("er") @ObfuscatedGetter( intValue = 636454135 ) - @Export("__bd_er") static int __bd_er; @ObfuscatedName("gw") @Export("regionMapArchiveIds") @@ -40,13 +38,11 @@ public class IndexCacheLoader { @ObfuscatedGetter( intValue = 1459455501 ) - @Export("__q") final int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 782003089 ) - @Export("__w") int __w; @ObfuscatedSignature( @@ -63,7 +59,6 @@ public class IndexCacheLoader { signature = "(I)Z", garbageValue = "1352221725" ) - @Export("__m_122") boolean __m_122() { this.__w = 0; diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java index db7bb30f1e..99aa4acd1b 100644 --- a/runescape-client/src/main/java/IndexStoreAction.java +++ b/runescape-client/src/main/java/IndexStoreAction.java @@ -11,7 +11,6 @@ public class IndexStoreAction extends Node { @ObfuscatedGetter( intValue = -1086790653 ) - @Export("__ik_rt") static int __ik_rt; @ObfuscatedName("a") @ObfuscatedSignature( @@ -23,7 +22,6 @@ public class IndexStoreAction extends Node { @ObfuscatedGetter( intValue = -1753937079 ) - @Export("__ik_cn") public static int __ik_cn; @ObfuscatedName("m") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java index 3df9d6688d..5d0c97e34c 100644 --- a/runescape-client/src/main/java/IndexStoreActionHandler.java +++ b/runescape-client/src/main/java/IndexStoreActionHandler.java @@ -23,7 +23,6 @@ public class IndexStoreActionHandler implements Runnable { @ObfuscatedGetter( intValue = -1282224505 ) - @Export("__iv_q") static int __iv_q; @ObfuscatedName("w") @Export("IndexStoreActionHandler_lock") diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 67fb180a08..9a0e481697 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -131,7 +131,6 @@ public final class IndexedSprite extends Rasterizer2D { } @ObfuscatedName("o") - @Export("__o_497") public void __o_497(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index f12708ef4a..e6f6ae9645 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -35,49 +35,41 @@ public class Instrument { @ObfuscatedSignature( signature = "Lde;" ) - @Export("__m") SoundEnvelope __m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__f") SoundEnvelope __f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__q") SoundEnvelope __q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__w") SoundEnvelope __w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__o") SoundEnvelope __o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__u") SoundEnvelope __u; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__g") SoundEnvelope __g; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lde;" ) - @Export("__l") SoundEnvelope __l; @ObfuscatedName("e") @Export("oscillatorVolume") @@ -104,7 +96,6 @@ public class Instrument { @ObfuscatedSignature( signature = "Lde;" ) - @Export("__a") SoundEnvelope __a; @ObfuscatedName("z") @Export("duration") diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 20baed429f..61ace7fd65 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -48,22 +48,17 @@ public class Interpreter { @Export("Interpreter_calendar") static Calendar Interpreter_calendar; @ObfuscatedName("z") - @Export("__bv_z") static final String[] __bv_z; @ObfuscatedName("s") - @Export("__bv_s") static boolean __bv_s; @ObfuscatedName("t") - @Export("__bv_t") static boolean __bv_t; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -1019558835 ) - @Export("__bv_y") static int __bv_y; @ObfuscatedName("r") - @Export("__bv_r") static final double __bv_r; static { @@ -141,6 +136,7 @@ public class Interpreter { signature = "(IIB)V", garbageValue = "76" ) + @Export("changeWorldSelectSorting") static void changeWorldSelectSorting(int var0, int var1) { int[] var2 = new int[4]; int[] var3 = new int[4]; diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 241df58b96..922b60700a 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -11,7 +11,6 @@ public class InvDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - @Export("__ib_f") static EvictingDualNodeHashTable __ib_f; @ObfuscatedName("q") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index d6005e0f59..11f5951763 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -11,31 +11,25 @@ public final class IsaacCipher { @ObfuscatedGetter( intValue = 1514845493 ) - @Export("__w") int __w; @ObfuscatedName("o") - @Export("__o") int[] __o; @ObfuscatedName("u") - @Export("__u") int[] __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1670027699 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -325762649 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1951204929 ) - @Export("__e") int __e; public IsaacCipher(int[] var1) { @@ -54,7 +48,6 @@ public final class IsaacCipher { signature = "(I)I", garbageValue = "-7509790" ) - @Export("__m_336") final int __m_336() { if(0 == --this.__w + 1) { this.__q_338(); @@ -69,7 +62,6 @@ public final class IsaacCipher { signature = "(I)I", garbageValue = "-506873526" ) - @Export("__f_337") final int __f_337() { if(this.__w == 0) { this.__q_338(); @@ -84,7 +76,6 @@ public final class IsaacCipher { signature = "(B)V", garbageValue = "124" ) - @Export("__q_338") final void __q_338() { this.__l += ++this.__e; @@ -115,7 +106,6 @@ public final class IsaacCipher { signature = "(I)V", garbageValue = "579890110" ) - @Export("__w_339") final void __w_339() { int var9 = -1640531527; int var8 = -1640531527; diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 577023f80e..8a99037d41 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -22,7 +22,6 @@ public class ItemContainer extends Node { @ObfuscatedSignature( signature = "Lit;" ) - @Export("__bc_dm") static IndexCache __bc_dm; @ObfuscatedName("f") @Export("ids") diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 14304761f6..79a6776a68 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -47,7 +47,6 @@ public class ItemDefinition extends DualNode { @ObfuscatedGetter( intValue = 1070080857 ) - @Export("__a") int __a; @ObfuscatedName("z") @Export("name") @@ -200,10 +199,8 @@ public class ItemDefinition extends DualNode { @Export("femaleHeadModel2") int femaleHeadModel2; @ObfuscatedName("az") - @Export("__az") int[] __az; @ObfuscatedName("au") - @Export("__au") int[] __au; @ObfuscatedName("ao") @ObfuscatedGetter( @@ -493,7 +490,6 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2051877377" ) - @Export("__o_426") void __o_426(ItemDefinition var1, ItemDefinition var2) { this.__a = var1.__a; this.zoom2d = var1.zoom2d; @@ -517,7 +513,6 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "227754762" ) - @Export("__u_427") void __u_427(ItemDefinition var1, ItemDefinition var2) { this.__a = var1.__a; this.zoom2d = var1.zoom2d; @@ -561,7 +556,6 @@ public class ItemDefinition extends DualNode { signature = "(Ljv;Ljv;I)V", garbageValue = "2084647027" ) - @Export("__g_428") void __g_428(ItemDefinition var1, ItemDefinition var2) { this.__a = var1.__a; this.zoom2d = var1.zoom2d; @@ -586,7 +580,6 @@ public class ItemDefinition extends DualNode { signature = "(II)Ldw;", garbageValue = "-223149161" ) - @Export("__l_429") public final ModelData __l_429(int var1) { int var3; if(this.__az != null && var1 > 1) { @@ -686,7 +679,6 @@ public class ItemDefinition extends DualNode { signature = "(IB)Ljv;", garbageValue = "0" ) - @Export("__x_430") public ItemDefinition __x_430(int var1) { if(this.__az != null && var1 > 1) { int var2 = -1; @@ -710,7 +702,6 @@ public class ItemDefinition extends DualNode { signature = "(ZI)Z", garbageValue = "-918880706" ) - @Export("__z_431") public final boolean __z_431(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; @@ -746,7 +737,6 @@ public class ItemDefinition extends DualNode { signature = "(ZB)Ldw;", garbageValue = "-123" ) - @Export("__j_432") public final ModelData __j_432(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; @@ -803,7 +793,6 @@ public class ItemDefinition extends DualNode { signature = "(ZI)Z", garbageValue = "-998582497" ) - @Export("__s_433") public final boolean __s_433(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; @@ -833,7 +822,6 @@ public class ItemDefinition extends DualNode { signature = "(ZI)Ldw;", garbageValue = "-1820885439" ) - @Export("__t_434") public final ModelData __t_434(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index f08c441a67..da2bea045e 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -55,7 +55,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - @Export("__q_448") public DualNode __q_448() { DualNode var1 = this.sentinel.previousDual; if(var1 == this.sentinel) { @@ -70,7 +69,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - @Export("__w_449") public DualNode __w_449() { return this.__o_450((DualNode)null); } @@ -79,7 +77,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "(Lfn;)Lfn;" ) - @Export("__o_450") DualNode __o_450(DualNode var1) { DualNode var2; if(var1 == null) { @@ -101,7 +98,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( signature = "()Lfn;" ) - @Export("__u_451") public DualNode __u_451() { DualNode var1 = this.head; if(var1 == this.sentinel) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 72fd6289c4..76c1205ba7 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -17,13 +17,11 @@ public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedSignature( signature = "Lfn;" ) - @Export("__f") DualNode __f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lfn;" ) - @Export("__q") DualNode __q; @ObfuscatedSignature( @@ -57,7 +55,6 @@ public class IterableDualNodeQueueIterator implements Iterator { return this.queue.sentinel != this.__f; } - @Export("__remove_442") @ObfuscatedName("remove") public void __remove_442() { if(this.__q == null) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 3b1a863597..dd0e92ce91 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -17,13 +17,11 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( signature = "Lgw;" ) - @Export("__f") Node __f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgw;" ) - @Export("__q") Node __q; @ObfuscatedSignature( @@ -38,14 +36,12 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( signature = "(Lja;)V" ) - @Export("__u_443") void __u_443(IterableNodeDeque var1) { this.deque = var1; this.__g_444(); } @ObfuscatedName("g") - @Export("__g_444") void __g_444() { this.__f = this.deque != null?this.deque.sentinel.previous:null; this.__q = null; @@ -72,7 +68,6 @@ public class IterableNodeDequeDescendingIterator implements Iterator { return var1; } - @Export("__remove_447") @ObfuscatedName("remove") public void __remove_447() { if(this.__q == null) { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index f6ac847231..87ce727ad7 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -17,16 +17,13 @@ public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedSignature( signature = "Lgw;" ) - @Export("__f") Node __f; @ObfuscatedName("q") - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgw;" ) - @Export("__w") Node __w; @ObfuscatedSignature( @@ -39,7 +36,6 @@ public class IterableNodeHashTableIterator implements Iterator { } @ObfuscatedName("u") - @Export("__u_483") void __u_483() { this.__f = this.hashTable.buckets[0].previous; this.__q = 1; @@ -89,7 +85,6 @@ public class IterableNodeHashTableIterator implements Iterator { } } - @Export("__remove_486") @ObfuscatedName("remove") public void __remove_486() { if(this.__w == null) { diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 48c3679ba0..7bd6aa523f 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -16,7 +16,6 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedGetter( intValue = -817957995 ) - @Export("__an_ra") static int __an_ra; @ObfuscatedName("m") @ObfuscatedSignature( @@ -46,52 +45,42 @@ public final class KeyHandler implements KeyListener, FocusListener { @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; @ObfuscatedName("cq") - @Export("__an_cq") static int[] __an_cq; @ObfuscatedName("ch") @ObfuscatedGetter( intValue = 1112094745 ) - @Export("__an_ch") static int __an_ch; @ObfuscatedName("cw") @ObfuscatedGetter( intValue = -1208053825 ) - @Export("__an_cw") static int __an_cw; @ObfuscatedName("cg") - @Export("__an_cg") static char[] __an_cg; @ObfuscatedName("cf") - @Export("__an_cf") static int[] __an_cf; @ObfuscatedName("cp") - @Export("__an_cp") public static int[] __an_cp; @ObfuscatedName("cl") @ObfuscatedGetter( intValue = -674534717 ) - @Export("__an_cl") public static int __an_cl; @ObfuscatedName("ct") @ObfuscatedGetter( intValue = -93280591 ) - @Export("__an_ct") static int __an_ct; @ObfuscatedName("cz") @ObfuscatedGetter( intValue = 2066759739 ) - @Export("__an_cz") static int __an_cz; @ObfuscatedName("cc") @ObfuscatedGetter( intValue = -1942898885 ) - @Export("__an_cc") static int __an_cc; @ObfuscatedName("ci") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index b6311ca8de..bb2b7caf1e 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -17,13 +17,11 @@ public class KitDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__im_f") public static AbstractIndexCache __im_f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 235389995 ) - @Export("__im_q") public static int __im_q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -35,10 +33,8 @@ public class KitDefinition extends DualNode { @ObfuscatedGetter( intValue = 1619779051 ) - @Export("__o") public int __o; @ObfuscatedName("u") - @Export("__u") int[] __u; @ObfuscatedName("g") @Export("recolorFrom") @@ -56,7 +52,6 @@ public class KitDefinition extends DualNode { @Export("archives") int[] archives; @ObfuscatedName("k") - @Export("__k") public boolean __k; static { @@ -137,7 +132,6 @@ public class KitDefinition extends DualNode { signature = "(I)Z", garbageValue = "-1250940659" ) - @Export("__w_413") public boolean __w_413() { if(this.__u == null) { return true; @@ -159,7 +153,6 @@ public class KitDefinition extends DualNode { signature = "(B)Ldw;", garbageValue = "0" ) - @Export("__o_414") public ModelData __o_414() { if(this.__u == null) { return null; @@ -199,7 +192,6 @@ public class KitDefinition extends DualNode { signature = "(I)Z", garbageValue = "742548471" ) - @Export("__u_415") public boolean __u_415() { boolean var1 = true; @@ -217,7 +209,6 @@ public class KitDefinition extends DualNode { signature = "(B)Ldw;", garbageValue = "-56" ) - @Export("__g_416") public ModelData __g_416() { ModelData[] var1 = new ModelData[5]; int var2 = 0; diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 45229494f1..b8722c44a4 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -10,13 +10,11 @@ public class Link { @ObfuscatedSignature( signature = "Lgh;" ) - @Export("__m") public Link __m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgh;" ) - @Export("__f") public Link __f; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 844a1ba5cb..c74ef769cc 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -10,13 +10,11 @@ public class LinkDeque { @ObfuscatedSignature( signature = "Lgh;" ) - @Export("__m") Link __m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgh;" ) - @Export("__f") Link __f; public LinkDeque() { @@ -29,7 +27,6 @@ public class LinkDeque { @ObfuscatedSignature( signature = "(Lgh;)V" ) - @Export("__m_437") public void __m_437(Link var1) { if(var1.__f != null) { var1.remove(); @@ -45,7 +42,6 @@ public class LinkDeque { @ObfuscatedSignature( signature = "()Lgh;" ) - @Export("__f_438") public Link __f_438() { Link var1 = this.__m.__m; if(var1 == this.__m) { @@ -61,7 +57,6 @@ public class LinkDeque { @ObfuscatedSignature( signature = "()Lgh;" ) - @Export("__q_439") public Link __q_439() { Link var1 = this.__f; if(var1 == this.__m) { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 33c3638dcf..82123fb5af 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -9,7 +9,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Login") public class Login { @ObfuscatedName("f") - @Export("__cu_f") static boolean __cu_f; @ObfuscatedName("q") @ObfuscatedGetter( @@ -60,13 +59,11 @@ public class Login { @ObfuscatedGetter( intValue = 1077910071 ) - @Export("__cu_aj") static int __cu_aj; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = 1677133239 ) - @Export("__cu_ac") static int __cu_ac; @ObfuscatedName("aw") @ObfuscatedGetter( @@ -93,16 +90,13 @@ public class Login { @Export("Login_password") static String Login_password; @ObfuscatedName("aa") - @Export("__cu_aa") static boolean __cu_aa; @ObfuscatedName("ax") - @Export("__cu_ax") static boolean __cu_ax; @ObfuscatedName("ai") @Export("otp") static String otp; @ObfuscatedName("ba") - @Export("__cu_ba") static boolean __cu_ba; @ObfuscatedName("bb") @ObfuscatedGetter( @@ -135,13 +129,11 @@ public class Login { @ObfuscatedGetter( longValue = 803647694904294325L ) - @Export("__cu_bi") static long __cu_bi; @ObfuscatedName("bz") @ObfuscatedGetter( longValue = -3234258972092460093L ) - @Export("__cu_bz") static long __cu_bz; @ObfuscatedName("do") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 3239d905c3..d3f674d1d9 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -13,37 +13,31 @@ public class LoginPacket implements ClientPacketMarker { @ObfuscatedSignature( signature = "Lgl;" ) - @Export("__gl_m") public static final LoginPacket __gl_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lgl;" ) - @Export("__gl_f") static final LoginPacket __gl_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgl;" ) - @Export("__gl_q") public static final LoginPacket __gl_q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgl;" ) - @Export("__gl_w") public static final LoginPacket __gl_w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lgl;" ) - @Export("__gl_o") static final LoginPacket __gl_o; @ObfuscatedName("g") @ObfuscatedSignature( signature = "[Lgl;" ) - @Export("__gl_g") static final LoginPacket[] __gl_g; @ObfuscatedName("u") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 5d2dae8ae1..ddceffb8d9 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -15,6 +15,7 @@ public class LoginScreenAnimation @ObfuscatedSignature( signature = "[Llq;" ) + @Export("sprites") IndexedSprite[] sprites; @ObfuscatedName("g") int[] field1015; diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 3f3dc2163a..91705d5b3d 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -11,64 +11,53 @@ public class LoginType { @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_m") public static final LoginType __lx_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_f") static final LoginType __lx_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_q") static final LoginType __lx_q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_w") static final LoginType __lx_w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_o") static final LoginType __lx_o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_u") static final LoginType __lx_u; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_g") static final LoginType __lx_g; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_l") static final LoginType __lx_l; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Llx;" ) - @Export("__lx_e") public static final LoginType __lx_e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1916729379 ) - @Export("__x") public final int __x; @ObfuscatedName("d") - @Export("__d") final String __d; static { @@ -96,7 +85,6 @@ public class LoginType { this.__d = var4; } - @Export("__toString_546") @ObfuscatedName("toString") public String __toString_546() { return this.__d; diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 657f52fcbb..1e3b209c99 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -46,6 +46,7 @@ public class MenuAction { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;B)Llq;", garbageValue = "0" ) + @Export("loadIndexedSpriteByName") public static IndexedSprite loadIndexedSpriteByName(AbstractIndexCache var0, String var1, String var2) { int var3 = var0.getArchiveId(var1); int var4 = var0.getRecordId(var3, var2); diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index d4992e3b60..570ff3192f 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Message") public class Message extends DualNode { @ObfuscatedName("i") - @Export("__bm_i") static int[] __bm_i; @ObfuscatedName("m") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index d48f4363d2..7425856d16 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("MidiFileReader") public class MidiFileReader { @ObfuscatedName("x") - @Export("__hs_x") static final byte[] __hs_x; @ObfuscatedName("m") @ObfuscatedSignature( @@ -28,13 +27,10 @@ public class MidiFileReader { @Export("trackLengths") int[] trackLengths; @ObfuscatedName("u") - @Export("__u") int[] __u; @ObfuscatedName("g") - @Export("__g") int __g; @ObfuscatedName("e") - @Export("__e") long __e; static { @@ -168,7 +164,6 @@ public class MidiFileReader { } @ObfuscatedName("d") - @Export("__d_371") int __d_371(int var1, int var2) { int var4; if(var2 == 255) { @@ -205,7 +200,6 @@ public class MidiFileReader { } @ObfuscatedName("a") - @Export("__a_372") long __a_372(int var1) { return this.__e + (long)var1 * (long)this.__g; } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index dbea7bfe22..800b277560 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -17,69 +17,51 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedGetter( intValue = 335918727 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2095480747 ) - @Export("__q") int __q; @ObfuscatedName("o") - @Export("__o") int[] __o; @ObfuscatedName("u") - @Export("__u") int[] __u; @ObfuscatedName("g") - @Export("__g") int[] __g; @ObfuscatedName("l") - @Export("__l") int[] __l; @ObfuscatedName("e") - @Export("__e") int[] __e; @ObfuscatedName("x") - @Export("__x") int[] __x; @ObfuscatedName("d") - @Export("__d") int[] __d; @ObfuscatedName("k") - @Export("__k") int[] __k; @ObfuscatedName("n") int[] __n; @ObfuscatedName("y") - @Export("__y") int[] __y; @ObfuscatedName("h") - @Export("__h") int[] __h; @ObfuscatedName("b") - @Export("__b") int[] __b; @ObfuscatedName("c") - @Export("__c") int[] __c; @ObfuscatedName("r") - @Export("__r") int[] __r; @ObfuscatedName("p") - @Export("__p") int[] __p; @ObfuscatedName("v") @ObfuscatedSignature( signature = "[[Lha;" ) - @Export("__v") MusicPatchNode[][] __v; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "[[Lha;" ) - @Export("__ag") MusicPatchNode[][] __ag; @ObfuscatedName("aq") @ObfuscatedSignature( @@ -88,7 +70,6 @@ public class MidiPcmStream extends PcmStream { @Export("midiFile") MidiFileReader midiFile; @ObfuscatedName("aj") - @Export("__aj") boolean __aj; @ObfuscatedName("av") @ObfuscatedGetter( @@ -106,13 +87,11 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedGetter( longValue = -7547625335559871937L ) - @Export("__ac") long __ac; @ObfuscatedName("ay") @ObfuscatedGetter( longValue = 3736036110499628937L ) - @Export("__ay") long __ay; @ObfuscatedName("ah") @ObfuscatedSignature( @@ -152,7 +131,6 @@ public class MidiPcmStream extends PcmStream { signature = "(IB)V", garbageValue = "92" ) - @Export("__m_340") public synchronized void __m_340(int var1) { this.__f = var1; } @@ -162,7 +140,6 @@ public class MidiPcmStream extends PcmStream { signature = "(I)I", garbageValue = "2067929289" ) - @Export("__f_341") public int __f_341() { return this.__f; } @@ -236,6 +213,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } @@ -244,6 +222,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } @@ -350,7 +329,6 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "789206119" ) - @Export("__j_342") public synchronized void __j_342(int var1, int var2) { this.__s_343(var1, var2); } @@ -360,7 +338,6 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "-1475022240" ) - @Export("__s_343") void __s_343(int var1, int var2) { this.__l[var1] = var2; this.__x[var1] = var2 & -128; @@ -372,7 +349,6 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "-213159072" ) - @Export("__t_344") void __t_344(int var1, int var2) { if(var2 != this.__e[var1]) { this.__e[var1] = var2; @@ -389,7 +365,6 @@ public class MidiPcmStream extends PcmStream { signature = "(IIIB)V", garbageValue = "15" ) - @Export("__y_345") void __y_345(int var1, int var2, int var3) { this.__b_347(var1, var2, 64); if((this.__y[var1] & 2) != 0) { @@ -458,7 +433,6 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;ZI)V", garbageValue = "-1455849160" ) - @Export("__h_346") void __h_346(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; @@ -482,7 +456,6 @@ public class MidiPcmStream extends PcmStream { signature = "(IIII)V", garbageValue = "-1244653525" ) - @Export("__b_347") void __b_347(int var1, int var2, int var3) { MusicPatchNode var4 = this.__v[var1][var2]; if(var4 != null) { @@ -506,7 +479,6 @@ public class MidiPcmStream extends PcmStream { signature = "(IIII)V", garbageValue = "1055105177" ) - @Export("__c_348") void __c_348(int var1, int var2, int var3) { } @@ -515,7 +487,6 @@ public class MidiPcmStream extends PcmStream { signature = "(IIB)V", garbageValue = "-43" ) - @Export("__p_349") void __p_349(int var1, int var2) { } @@ -524,7 +495,6 @@ public class MidiPcmStream extends PcmStream { signature = "(IIB)V", garbageValue = "-1" ) - @Export("__v_350") void __v_350(int var1, int var2) { this.__d[var1] = var2; } @@ -534,7 +504,6 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "137929054" ) - @Export("__ah_351") void __ah_351(int var1) { for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { if(var1 < 0 || var2.__m == var1) { @@ -562,7 +531,6 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "-59494316" ) - @Export("__ab_352") void __ab_352(int var1) { if(var1 >= 0) { this.__o[var1] = 12800; @@ -591,7 +559,6 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "1458917637" ) - @Export("__ae_353") void __ae_353(int var1) { for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { if((var1 < 0 || var2.__m == var1) && var2.__a < 0) { @@ -607,7 +574,6 @@ public class MidiPcmStream extends PcmStream { signature = "(I)V", garbageValue = "808372536" ) - @Export("__at_354") void __at_354() { this.__ah_351(-1); this.__ab_352(-1); @@ -628,7 +594,6 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "-1934460661" ) - @Export("__ad_355") void __ad_355(int var1) { if((this.__y[var1] & 2) != 0) { for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { @@ -645,7 +610,6 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "-1305073262" ) - @Export("__ap_356") void __ap_356(int var1) { if((this.__y[var1] & 4) != 0) { for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { @@ -662,7 +626,6 @@ public class MidiPcmStream extends PcmStream { signature = "(II)V", garbageValue = "1168111396" ) - @Export("__au_357") void __au_357(int var1) { int var2 = var1 & 240; int var3; @@ -850,7 +813,6 @@ public class MidiPcmStream extends PcmStream { signature = "(III)V", garbageValue = "1380282032" ) - @Export("__ao_358") void __ao_358(int var1, int var2) { this.__r[var1] = var2; this.__p[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); @@ -861,7 +823,6 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)I", garbageValue = "-1821299983" ) - @Export("__aa_359") int __aa_359(MusicPatchNode var1) { int var2 = (var1.__d * var1.__x >> 12) + var1.__e; var2 += (this.__d[var1.__m] - 8192) * this.__b[var1.__m] >> 12; @@ -888,7 +849,6 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)I", garbageValue = "24812899" ) - @Export("__ax_360") int __ax_360(MusicPatchNode var1) { MusicPatchNode2 var2 = var1.__w; int var3 = this.__o[var1.__m] * this.__g[var1.__m] + 4096 >> 13; @@ -935,7 +895,6 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)I", garbageValue = "360643400" ) - @Export("__af_361") int __af_361(MusicPatchNode var1) { int var2 = this.__u[var1.__m]; return var2 < 8192?var2 * var1.__l + 32 >> 6:16384 - ((128 - var1.__l) * (16384 - var2) + 32 >> 6); @@ -946,7 +905,6 @@ public class MidiPcmStream extends PcmStream { signature = "(B)V", garbageValue = "30" ) - @Export("__ai_367") void __ai_367() { int var1 = this.track; int var2 = this.trackLength; @@ -993,7 +951,6 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;I)Z", garbageValue = "1820762013" ) - @Export("__ba_368") boolean __ba_368(MusicPatchNode var1) { if(var1.stream == null) { if(var1.__a >= 0) { @@ -1014,7 +971,6 @@ public class MidiPcmStream extends PcmStream { signature = "(Lha;[IIII)Z", garbageValue = "-1605961549" ) - @Export("__bb_369") boolean __bb_369(MusicPatchNode var1, int[] var2, int var3, int var4) { var1.__y = class309.PcmPlayer_sampleRate / 100; if(var1.__a < 0 || var1.stream != null && !var1.stream.__ae_195()) { diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 256c297e67..14f7d02a67 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -14,37 +14,31 @@ public class MilliClock extends Clock { @Export("decimator") static Decimator decimator; @ObfuscatedName("m") - @Export("__m") long[] __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1940981129 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1217137493 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( longValue = -8372744267470318611L ) - @Export("__w") long __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 250272357 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 576555527 ) - @Export("__u") int __u; public MilliClock() { @@ -65,6 +59,7 @@ public class MilliClock extends Clock { signature = "(B)V", garbageValue = "61" ) + @Export("mark") public void mark() { for(int var1 = 0; var1 < 10; ++var1) { this.__m[var1] = 0L; @@ -77,6 +72,7 @@ public class MilliClock extends Clock { signature = "(III)I", garbageValue = "-126803683" ) + @Export("wait") public int wait(int var1, int var2) { int var3 = this.__f; int var4 = this.__q; diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 8ed74b9e96..bd90fa306f 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -25,10 +25,8 @@ public class Model extends Entity { @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; @ObfuscatedName("at") - @Export("__du_at") static boolean[] __du_at; @ObfuscatedName("ad") - @Export("__du_ad") static boolean[] __du_ad; @ObfuscatedName("ap") @Export("modelViewportXs") @@ -37,46 +35,32 @@ public class Model extends Entity { @Export("modelViewportYs") static int[] modelViewportYs; @ObfuscatedName("am") - @Export("__du_am") static int[] __du_am; @ObfuscatedName("an") - @Export("__du_an") static int[] __du_an; @ObfuscatedName("az") - @Export("__du_az") static int[] __du_az; @ObfuscatedName("au") - @Export("__du_au") static int[] __du_au; @ObfuscatedName("aa") - @Export("__du_aa") static int[] __du_aa; @ObfuscatedName("ax") - @Export("__du_ax") static int[][] __du_ax; @ObfuscatedName("af") - @Export("__du_af") static int[] __du_af; @ObfuscatedName("ai") - @Export("__du_ai") static int[][] __du_ai; @ObfuscatedName("ba") - @Export("__du_ba") static int[] __du_ba; @ObfuscatedName("bb") - @Export("__du_bb") static int[] __du_bb; @ObfuscatedName("bs") - @Export("__du_bs") static int[] __du_bs; @ObfuscatedName("bq") - @Export("__du_bq") static int[] __du_bq; @ObfuscatedName("bn") - @Export("__du_bn") static int[] __du_bn; @ObfuscatedName("bk") - @Export("__du_bk") static int[] __du_bk; @ObfuscatedName("bd") @Export("Model_transformTempX") @@ -88,7 +72,6 @@ public class Model extends Entity { @Export("Model_transformTempZ") static int Model_transformTempZ; @ObfuscatedName("bx") - @Export("__du_bx") static boolean __du_bx; @ObfuscatedName("bm") @Export("Model_sine") @@ -97,10 +80,8 @@ public class Model extends Entity { @Export("Model_cosine") static int[] Model_cosine; @ObfuscatedName("br") - @Export("__du_br") static int[] __du_br; @ObfuscatedName("bj") - @Export("__du_bj") static int[] __du_bj; @ObfuscatedName("o") @Export("verticesCount") @@ -142,25 +123,19 @@ public class Model extends Entity { @Export("faceAlphas") byte[] faceAlphas; @ObfuscatedName("s") - @Export("__s") byte[] __s; @ObfuscatedName("t") @Export("faceTextures") short[] faceTextures; @ObfuscatedName("y") - @Export("__y") byte __y; @ObfuscatedName("h") - @Export("__h") int __h; @ObfuscatedName("b") - @Export("__b") int[] __b; @ObfuscatedName("c") - @Export("__c") int[] __c; @ObfuscatedName("r") - @Export("__r") int[] __r; @ObfuscatedName("p") @Export("vertexLabels") @@ -667,7 +642,6 @@ public class Model extends Entity { } @ObfuscatedName("g") - @Export("__g_232") void __g_232() { if(this.boundsType != 2) { this.boundsType = 2; @@ -690,7 +664,6 @@ public class Model extends Entity { } @ObfuscatedName("l") - @Export("__l_233") public int __l_233() { this.calculateBoundsCylinder(); return this.xzRadius; @@ -1008,7 +981,6 @@ public class Model extends Entity { } @ObfuscatedName("c") - @Export("__c_234") public final void __c_234(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { __du_aa[0] = -1; if(this.boundsType != 2 && this.boundsType != 1) { @@ -1074,7 +1046,6 @@ public class Model extends Entity { } @ObfuscatedName("p") - @Export("__p_235") public final void __p_235(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { __du_aa[0] = -1; if(this.boundsType != 2 && this.boundsType != 1) { @@ -1364,7 +1335,6 @@ public class Model extends Entity { } @ObfuscatedName("ag") - @Export("__ag_236") final void __ag_236(int var1) { if(__du_ad[var1]) { this.__aq_237(var1); @@ -1409,7 +1379,6 @@ public class Model extends Entity { } @ObfuscatedName("aq") - @Export("__aq_237") final void __aq_237(int var1) { int var2 = Rasterizer3D.Rasterizer3D_clipMidX; int var3 = Rasterizer3D.Rasterizer3D_clipMidY; @@ -1577,6 +1546,7 @@ public class Model extends Entity { } @ObfuscatedName("cy") + @Export("renderDraw") void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { __du_aa[0] = -1; if(this.boundsType != 1) { diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 22bf1387c8..a0ce7dd443 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -7,13 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("ModelData") public class ModelData extends Entity { @ObfuscatedName("aw") - @Export("__dw_aw") static int[] __dw_aw; @ObfuscatedName("al") - @Export("__dw_al") static int[] __dw_al; @ObfuscatedName("ab") - @Export("__dw_ab") static int __dw_ab; @ObfuscatedName("ae") @Export("ModelData_sine") @@ -46,10 +43,8 @@ public class ModelData extends Entity { @Export("indices3") int[] indices3; @ObfuscatedName("e") - @Export("__e") byte[] __e; @ObfuscatedName("x") - @Export("__x") byte[] __x; @ObfuscatedName("d") @Export("faceAlphas") @@ -64,10 +59,8 @@ public class ModelData extends Entity { @Export("faceTextures") short[] faceTextures; @ObfuscatedName("a") - @Export("__a") byte __a; @ObfuscatedName("z") - @Export("__z") int __z; @ObfuscatedName("j") @Export("textureRenderTypes") @@ -82,10 +75,8 @@ public class ModelData extends Entity { @Export("texTriangleZ") short[] texTriangleZ; @ObfuscatedName("h") - @Export("__h") int[] __h; @ObfuscatedName("b") - @Export("__b") int[] __b; @ObfuscatedName("c") @Export("vertexLabels") @@ -103,37 +94,28 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "[Ldq;" ) - @Export("__v") VertexNormal[] __v; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "[Ldq;" ) - @Export("__ag") VertexNormal[] __ag; @ObfuscatedName("aq") - @Export("__aq") public short __aq; @ObfuscatedName("aj") - @Export("__aj") public short __aj; @ObfuscatedName("av") @Export("isBoundsCalculated") boolean isBoundsCalculated; @ObfuscatedName("ar") - @Export("__ar") int __ar; @ObfuscatedName("ac") - @Export("__ac") int __ac; @ObfuscatedName("ay") - @Export("__ay") int __ay; @ObfuscatedName("ah") - @Export("__ah") int __ah; @ObfuscatedName("ak") - @Export("__ak") int __ak; static { @@ -390,7 +372,6 @@ public class ModelData extends Entity { } @ObfuscatedName("f") - @Export("__f_215") void __f_215(byte[] var1) { Buffer var2 = new Buffer(var1); Buffer var3 = new Buffer(var1); @@ -697,7 +678,6 @@ public class ModelData extends Entity { } @ObfuscatedName("q") - @Export("__q_216") void __q_216(byte[] var1) { boolean var2 = false; boolean var3 = false; @@ -978,7 +958,6 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "(Ldw;I)I" ) - @Export("__w_217") final int __w_217(ModelData var1, int var2) { int var3 = -1; int var4 = var1.verticesX[var2]; @@ -1010,7 +989,6 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "()Ldw;" ) - @Export("__o_218") public ModelData __o_218() { ModelData var1 = new ModelData(); if(this.__e != null) { @@ -1055,7 +1033,6 @@ public class ModelData extends Entity { @ObfuscatedSignature( signature = "([[IIIIZI)Ldw;" ) - @Export("__u_219") public ModelData __u_219(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.__c_229(); int var7 = var2 + this.__ac; @@ -1147,7 +1124,6 @@ public class ModelData extends Entity { } @ObfuscatedName("g") - @Export("__g_220") void __g_220() { int[] var1; int var2; @@ -1208,7 +1184,6 @@ public class ModelData extends Entity { } @ObfuscatedName("l") - @Export("__l_221") public void __l_221() { for(int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesX[var1]; @@ -1220,7 +1195,6 @@ public class ModelData extends Entity { } @ObfuscatedName("x") - @Export("__x_222") public void __x_222() { for(int var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesX[var1] = -this.verticesX[var1]; @@ -1231,7 +1205,6 @@ public class ModelData extends Entity { } @ObfuscatedName("d") - @Export("__d_223") public void __d_223() { for(int var1 = 0; var1 < this.verticesCount; ++var1) { int var2 = this.verticesZ[var1]; @@ -1243,7 +1216,6 @@ public class ModelData extends Entity { } @ObfuscatedName("a") - @Export("__a_224") public void __a_224(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1258,7 +1230,6 @@ public class ModelData extends Entity { } @ObfuscatedName("z") - @Export("__z_225") public void __z_225(int var1, int var2, int var3) { for(int var4 = 0; var4 < this.verticesCount; ++var4) { this.verticesX[var4] += var1; @@ -1294,7 +1265,6 @@ public class ModelData extends Entity { } @ObfuscatedName("t") - @Export("__t_226") public void __t_226() { int var1; for(var1 = 0; var1 < this.verticesCount; ++var1) { @@ -1311,7 +1281,6 @@ public class ModelData extends Entity { } @ObfuscatedName("y") - @Export("__y_227") public void __y_227(int var1, int var2, int var3) { for(int var4 = 0; var4 < this.verticesCount; ++var4) { this.verticesX[var4] = this.verticesX[var4] * var1 / 128; @@ -1323,7 +1292,6 @@ public class ModelData extends Entity { } @ObfuscatedName("h") - @Export("__h_228") public void __h_228() { if(this.__v == null) { this.__v = new VertexNormal[this.verticesCount]; @@ -1408,7 +1376,6 @@ public class ModelData extends Entity { } @ObfuscatedName("c") - @Export("__c_229") void __c_229() { if(!this.isBoundsCalculated) { super.height = 0; diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index c5860d85e0..22f81c03b4 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -17,7 +17,6 @@ public class MouseRecorder implements Runnable { @ObfuscatedGetter( intValue = 1075569245 ) - @Export("__bu_hy") static int __bu_hy; @ObfuscatedName("m") @Export("isRunning") diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 6cca354e21..62907185a1 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -46,6 +46,7 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { signature = "(I)I", garbageValue = "1293035280" ) + @Export("useRotation") public synchronized int useRotation() { int var1 = this.rotation; this.rotation = 0; diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index d91cca4a74..a51914bfd3 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -11,7 +11,6 @@ public class MusicPatch extends Node { @ObfuscatedGetter( intValue = 574200865 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedSignature( @@ -20,25 +19,19 @@ public class MusicPatch extends Node { @Export("rawSounds") RawSound[] rawSounds; @ObfuscatedName("q") - @Export("__q") short[] __q; @ObfuscatedName("w") - @Export("__w") byte[] __w; @ObfuscatedName("o") - @Export("__o") byte[] __o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "[Lhd;" ) - @Export("__u") MusicPatchNode2[] __u; @ObfuscatedName("g") - @Export("__g") byte[] __g; @ObfuscatedName("l") - @Export("__l") int[] __l; MusicPatch(byte[] var1) { @@ -497,7 +490,6 @@ public class MusicPatch extends Node { signature = "(Ldt;[B[II)Z", garbageValue = "1828768318" ) - @Export("__f_373") boolean __f_373(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 79856ad4f7..66f778d7ee 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -17,7 +17,6 @@ public class MusicPatchNode extends Node { @ObfuscatedGetter( intValue = 801157533 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedSignature( @@ -35,55 +34,46 @@ public class MusicPatchNode extends Node { @ObfuscatedSignature( signature = "Lhd;" ) - @Export("__w") MusicPatchNode2 __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -2058553171 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 62958303 ) - @Export("__u") int __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -836502917 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -308599455 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -471899285 ) - @Export("__e") int __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1520706641 ) - @Export("__x") int __x; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -852988281 ) - @Export("__d") int __d; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -439388365 ) - @Export("__k") int __k; @ObfuscatedName("n") @ObfuscatedGetter( @@ -94,31 +84,26 @@ public class MusicPatchNode extends Node { @ObfuscatedGetter( intValue = -2136855685 ) - @Export("__i") int __i; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -2083252379 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1605236771 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 173672931 ) - @Export("__j") int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 219840779 ) - @Export("__s") int __s; @ObfuscatedName("t") @ObfuscatedSignature( @@ -130,13 +115,11 @@ public class MusicPatchNode extends Node { @ObfuscatedGetter( intValue = -666877449 ) - @Export("__y") int __y; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1359854411 ) - @Export("__b") int __b; @ObfuscatedName("m") @@ -144,7 +127,6 @@ public class MusicPatchNode extends Node { signature = "(B)V", garbageValue = "39" ) - @Export("__m_370") void __m_370() { this.patch = null; this.rawSound = null; diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index f98ddc01f9..71625b12cc 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -10,54 +10,44 @@ public class MusicPatchNode2 { @ObfuscatedGetter( longValue = -6780258776884306463L ) - @Export("__hd_fc") static long __hd_fc; @ObfuscatedName("m") - @Export("__m") byte[] __m; @ObfuscatedName("f") - @Export("__f") byte[] __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 140046797 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -249046051 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1455145595 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1577527995 ) - @Export("__u") int __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 391670135 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 320761691 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 1984131473 ) - @Export("__e") int __e; } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index f4956e6edc..664d11868d 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -11,7 +11,6 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedGetter( intValue = -1367955455 ) - @Export("__hq_qg") static int __hq_qg; @ObfuscatedName("m") @ObfuscatedSignature( @@ -46,7 +45,6 @@ public class MusicPatchPcmStream extends PcmStream { signature = "(Lha;[IIIII)V", garbageValue = "1988628167" ) - @Export("__m_379") void __m_379(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) { int var6 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate; @@ -97,7 +95,6 @@ public class MusicPatchPcmStream extends PcmStream { signature = "(Lha;II)V", garbageValue = "1882591412" ) - @Export("__f_380") void __f_380(MusicPatchNode var1, int var2) { if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) { int var3 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate; @@ -126,6 +123,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); return (PcmStream)(var1 == null?null:(var1.stream != null?var1.stream:this.nextSubStream())); @@ -135,6 +133,7 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java index d3f9c83d47..7c5cb71a6a 100644 --- a/runescape-client/src/main/java/MusicSample.java +++ b/runescape-client/src/main/java/MusicSample.java @@ -7,19 +7,14 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("MusicSample") public class MusicSample extends Node { @ObfuscatedName("g") - @Export("__cd_g") static byte[] __cd_g; @ObfuscatedName("l") - @Export("__cd_l") static int __cd_l; @ObfuscatedName("e") - @Export("__cd_e") static int __cd_e; @ObfuscatedName("x") - @Export("__cd_x") static int __cd_x; @ObfuscatedName("d") - @Export("__cd_d") static int __cd_d; @ObfuscatedName("k") @ObfuscatedSignature( @@ -42,43 +37,30 @@ public class MusicSample extends Node { ) static class114[] field1326; @ObfuscatedName("z") - @Export("__cd_z") static boolean[] __cd_z; @ObfuscatedName("j") - @Export("__cd_j") static int[] __cd_j; @ObfuscatedName("s") - @Export("__cd_s") static boolean __cd_s; @ObfuscatedName("c") - @Export("__cd_c") static float[] __cd_c; @ObfuscatedName("r") - @Export("__cd_r") static float[] __cd_r; @ObfuscatedName("p") - @Export("__cd_p") static float[] __cd_p; @ObfuscatedName("v") - @Export("__cd_v") static float[] __cd_v; @ObfuscatedName("ag") - @Export("__cd_ag") static float[] __cd_ag; @ObfuscatedName("aq") - @Export("__cd_aq") static float[] __cd_aq; @ObfuscatedName("aj") - @Export("__cd_aj") static float[] __cd_aj; @ObfuscatedName("av") - @Export("__cd_av") static int[] __cd_av; @ObfuscatedName("ar") - @Export("__cd_ar") static int[] __cd_ar; @ObfuscatedName("m") - @Export("__m") byte[][] __m; @ObfuscatedName("f") @Export("sampleRate") @@ -93,28 +75,21 @@ public class MusicSample extends Node { @Export("end") int end; @ObfuscatedName("u") - @Export("__u") boolean __u; @ObfuscatedName("t") - @Export("__t") float[] __t; @ObfuscatedName("y") - @Export("__y") int __y; @ObfuscatedName("h") - @Export("__h") int __h; @ObfuscatedName("b") - @Export("__b") boolean __b; @ObfuscatedName("ac") @Export("samples") byte[] samples; @ObfuscatedName("ay") - @Export("__ay") int __ay; @ObfuscatedName("ah") - @Export("__ah") int __ah; static { @@ -158,7 +133,6 @@ public class MusicSample extends Node { } @ObfuscatedName("g") - @Export("__g_175") float[] __g_175(int var1) { method2337(this.__m[var1], 0); method2338(); diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 6f340aae23..bd207d4761 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -336,7 +336,6 @@ public class MusicTrack extends Node { } @ObfuscatedName("f") - @Export("__f_381") void __f_381() { if(this.table == null) { this.table = new NodeHashTable(16); diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 5abf46daf5..22fb3b32eb 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -23,6 +23,7 @@ public class NanoClock extends Clock { signature = "(B)V", garbageValue = "61" ) + @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } @@ -32,6 +33,7 @@ public class NanoClock extends Clock { signature = "(III)I", garbageValue = "-126803683" ) + @Export("wait") public int wait(int var1, int var2) { long var3 = 1000000L * (long)var2; long var5 = this.lastTimeNano - System.nanoTime(); diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 94aac85c0a..660896990b 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -18,13 +18,11 @@ public class NetCache { @ObfuscatedGetter( intValue = 948359621 ) - @Export("__iq_f") public static int __iq_f; @ObfuscatedName("q") @ObfuscatedGetter( longValue = -4580427166942649525L ) - @Export("__iq_q") public static long __iq_q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -90,7 +88,6 @@ public class NetCache { @ObfuscatedGetter( intValue = 840549915 ) - @Export("__iq_j") public static int __iq_j; @ObfuscatedName("t") @Export("NetCache_crc") @@ -102,7 +99,6 @@ public class NetCache { @Export("NetCache_indexCaches") public static IndexCache[] NetCache_indexCaches; @ObfuscatedName("b") - @Export("__iq_b") public static byte __iq_b; @ObfuscatedName("c") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index fa0ad800ee..f01da8362d 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -49,13 +49,11 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedGetter( intValue = -738185459 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 2057244853 ) - @Export("__e") int __e; @ObfuscatedName("x") @Export("exceptionWriting") @@ -64,13 +62,11 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedGetter( intValue = -1644762957 ) - @Export("__d") final int __d; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -782964015 ) - @Export("__k") final int __k; @ObfuscatedSignature( @@ -98,6 +94,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(II)Z", garbageValue = "1765046516" ) + @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.isClosed?false:this.inputStream.available() >= var1; } @@ -107,6 +104,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(I)I", garbageValue = "-1078471130" ) + @Export("available") public int available() throws IOException { return this.isClosed?0:this.inputStream.available(); } @@ -116,6 +114,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(I)I", garbageValue = "516705222" ) + @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed?0:this.inputStream.read(); } @@ -125,6 +124,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "([BIII)I", garbageValue = "-1089665746" ) + @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { if(this.isClosed) { return 0; @@ -149,6 +149,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "([BIIB)V", garbageValue = "-86" ) + @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.write0(var1, var2, var3); } @@ -158,6 +159,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(I)V", garbageValue = "-1252618448" ) + @Export("close") public void close() { if(!this.isClosed) { synchronized(this) { @@ -305,6 +307,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(IIILfe;Lfy;Z[I[IB)I", garbageValue = "-98" ) + @Export("calculateRoute") public static int calculateRoute(int srcX, int srcY, int srcSize, RouteStrategy strategy, CollisionMap collisionMap, boolean var5, int[] bufferX, int[] bufferY) { int graphBaseX; for(int var8 = 0; var8 < 128; ++var8) { diff --git a/runescape-client/src/main/java/Npc.java b/runescape-client/src/main/java/Npc.java index 8d0db12d02..eb11180d3b 100644 --- a/runescape-client/src/main/java/Npc.java +++ b/runescape-client/src/main/java/Npc.java @@ -18,7 +18,6 @@ public final class Npc extends Actor { signature = "(IBI)V", garbageValue = "306250019" ) - @Export("__m_162") final void __m_162(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; @@ -82,7 +81,6 @@ public final class Npc extends Actor { signature = "(IIZI)V", garbageValue = "-1647134110" ) - @Export("__f_163") final void __f_163(int var1, int var2, boolean var3) { if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) { super.sequence = -1; @@ -159,6 +157,7 @@ public final class Npc extends Actor { signature = "(B)Z", garbageValue = "1" ) + @Export("isVisible") final boolean isVisible() { return this.definition != null; } diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NpcDefinition.java index 244c978e2b..8161c2cc1e 100644 --- a/runescape-client/src/main/java/NpcDefinition.java +++ b/runescape-client/src/main/java/NpcDefinition.java @@ -55,7 +55,6 @@ public class NpcDefinition extends DualNode { @Export("archives") int[] archives; @ObfuscatedName("e") - @Export("__e") int[] __e; @ObfuscatedName("x") @ObfuscatedGetter( @@ -142,13 +141,11 @@ public class NpcDefinition extends DualNode { @ObfuscatedGetter( intValue = -1235927151 ) - @Export("__ag") int __ag; @ObfuscatedName("aq") @ObfuscatedGetter( intValue = 1962875903 ) - @Export("__aq") int __aq; @ObfuscatedName("aj") @ObfuscatedGetter( @@ -160,7 +157,6 @@ public class NpcDefinition extends DualNode { @ObfuscatedGetter( intValue = -506638747 ) - @Export("__av") public int __av; @ObfuscatedName("ar") @Export("transforms") @@ -534,7 +530,6 @@ public class NpcDefinition extends DualNode { signature = "(I)Z", garbageValue = "853540088" ) - @Export("__e_435") public boolean __e_435() { if(this.transforms == null) { return true; diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index c4ec49ab44..0599790b68 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -20,7 +20,6 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jr_q") static AbstractIndexCache __jr_q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -32,13 +31,11 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - @Export("__jr_o") public static EvictingDualNodeHashTable __jr_o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Ler;" ) - @Export("__jr_u") static EvictingDualNodeHashTable __jr_u; @ObfuscatedName("g") @ObfuscatedSignature( @@ -50,7 +47,6 @@ public class ObjectDefinition extends DualNode { @ObfuscatedSignature( signature = "[Ldw;" ) - @Export("__jr_l") static ModelData[] __jr_l; @ObfuscatedName("e") @ObfuscatedGetter( @@ -59,10 +55,8 @@ public class ObjectDefinition extends DualNode { @Export("id") public int id; @ObfuscatedName("x") - @Export("__x") int[] __x; @ObfuscatedName("d") - @Export("__d") int[] __d; @ObfuscatedName("k") @Export("name") @@ -251,7 +245,6 @@ public class ObjectDefinition extends DualNode { @Export("int6") public int int6; @ObfuscatedName("ax") - @Export("__ax") public int[] __ax; @ObfuscatedName("af") @ObfuscatedSignature( @@ -527,7 +520,6 @@ public class ObjectDefinition extends DualNode { signature = "(II)Z", garbageValue = "1880172029" ) - @Export("__u_421") public final boolean __u_421(int var1) { if(this.__d != null) { for(int var4 = 0; var4 < this.__d.length; ++var4) { @@ -557,7 +549,6 @@ public class ObjectDefinition extends DualNode { signature = "(I)Z", garbageValue = "-666846742" ) - @Export("__g_422") public final boolean __g_422() { if(this.__x == null) { return true; @@ -577,7 +568,6 @@ public class ObjectDefinition extends DualNode { signature = "(II[[IIIIS)Lex;", garbageValue = "-27831" ) - @Export("__l_423") public final Entity __l_423(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if(this.__d == null) { @@ -897,7 +887,6 @@ public class ObjectDefinition extends DualNode { signature = "(I)Z", garbageValue = "8470625" ) - @Export("__t_424") public boolean __t_424() { if(this.transforms == null) { return this.ambientSoundId != -1 || this.__ax != null; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 7ba86e37ed..773f32dc91 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -23,37 +23,31 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = 647270745 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -800464493 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -85911525 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -211591209 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 512258949 ) - @Export("__u") int __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1344558633 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( @@ -71,13 +65,11 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = -1608400407 ) - @Export("__x") int __x; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1748890449 ) - @Export("__d") int __d; @ObfuscatedName("k") @Export("soundEffectIds") diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index e45cc14872..ba1f42329d 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -77,7 +77,6 @@ public final class Occluder { @ObfuscatedGetter( intValue = 826041747 ) - @Export("__k") int __k; @ObfuscatedName("n") @ObfuscatedGetter( @@ -88,31 +87,26 @@ public final class Occluder { @ObfuscatedGetter( intValue = 1324959981 ) - @Export("__i") int __i; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1527021367 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -570391007 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -373839103 ) - @Export("__j") int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1334433969 ) - @Export("__s") int __s; @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java index 001869f336..89a966d8dc 100644 --- a/runescape-client/src/main/java/OverlayDefinition.java +++ b/runescape-client/src/main/java/OverlayDefinition.java @@ -11,13 +11,11 @@ public class OverlayDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jf_m") public static AbstractIndexCache __jf_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - @Export("__jf_f") public static EvictingDualNodeHashTable __jf_f; @ObfuscatedName("q") @ObfuscatedGetter( @@ -32,7 +30,6 @@ public class OverlayDefinition extends DualNode { @Export("texture") public int texture; @ObfuscatedName("o") - @Export("__o") public boolean __o; @ObfuscatedName("u") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/OwnWorldComparator.java index 00cc8d8ca5..0c81a18929 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/OwnWorldComparator.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("OwnWorldComparator") public class OwnWorldComparator implements Comparator { @ObfuscatedName("m") - @Export("__m") boolean __m; @ObfuscatedName("m") @@ -16,7 +15,6 @@ public class OwnWorldComparator implements Comparator { signature = "(Ll;Ll;B)I", garbageValue = "21" ) - @Export("__m_132") int __m_132(GrandExchangeEvent var1, GrandExchangeEvent var2) { if(var2.world == var1.world) { return 0; @@ -35,7 +33,6 @@ public class OwnWorldComparator implements Comparator { } } - @Export("__equals_134") @ObfuscatedName("equals") public boolean __equals_134(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 8198487a11..308a9d2a77 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -14,7 +14,6 @@ public final class PacketBuffer extends Buffer { @ObfuscatedGetter( intValue = 701739159 ) - @Export("__hx_z") public static int __hx_z; @ObfuscatedName("e") @ObfuscatedSignature( @@ -82,7 +81,6 @@ public final class PacketBuffer extends Buffer { signature = "(B)Z", garbageValue = "101" ) - @Export("__ig_334") public boolean __ig_334() { int var1 = super.array[super.index] - this.isaacCipher0.__f_337() & 255; return var1 >= 128; @@ -104,7 +102,6 @@ public final class PacketBuffer extends Buffer { signature = "([BIII)V", garbageValue = "-1168019189" ) - @Export("__jb_335") public void __jb_335(byte[] var1, int var2, int var3) { for(int var4 = 0; var4 < var3; ++var4) { var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.__m_336()); diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 15514416c1..4db93c1b8c 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -17,19 +17,16 @@ public class PacketBufferNode extends Node { @ObfuscatedGetter( intValue = -1583654139 ) - @Export("__gg_u") public static int __gg_u; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgs;" ) - @Export("__m") public ClientPacket __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1433542775 ) - @Export("__f") public int __f; @ObfuscatedName("q") @ObfuscatedSignature( @@ -41,7 +38,6 @@ public class PacketBufferNode extends Node { @ObfuscatedGetter( intValue = -2051819203 ) - @Export("__w") public int __w; static { @@ -54,7 +50,6 @@ public class PacketBufferNode extends Node { signature = "(I)V", garbageValue = "-1987685511" ) - @Export("__f_292") public void __f_292() { if(__gg_u < packetBufferNodes.length) { packetBufferNodes[++__gg_u - 1] = this; diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 3914b1bf80..d01f2bce26 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -30,7 +30,6 @@ public class PacketWriter { @ObfuscatedGetter( intValue = -1028046199 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -63,25 +62,21 @@ public class PacketWriter { @Export("serverPacket0Length") int serverPacket0Length; @ObfuscatedName("e") - @Export("__e") boolean __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 120570975 ) - @Export("__x") int __x; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1672229609 ) - @Export("__d") int __d; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__k") ServerPacket __k; @ObfuscatedName("n") @ObfuscatedSignature( @@ -92,7 +87,6 @@ public class PacketWriter { @ObfuscatedSignature( signature = "Lge;" ) - @Export("__i") ServerPacket __i; PacketWriter() { @@ -112,7 +106,6 @@ public class PacketWriter { signature = "(I)V", garbageValue = "1561094077" ) - @Export("__m_165") final void __m_165() { this.packetBufferNodes.clear(); this.__q = 0; @@ -123,7 +116,6 @@ public class PacketWriter { signature = "(I)V", garbageValue = "-1839929685" ) - @Export("__f_166") final void __f_166() throws IOException { if(this.socket0 != null && this.__q > 0) { this.buffer.index = 0; @@ -151,7 +143,6 @@ public class PacketWriter { signature = "(Lgg;I)V", garbageValue = "599379248" ) - @Export("__q_167") public final void __q_167(PacketBufferNode var1) { this.packetBufferNodes.addFirst(var1); var1.__w = var1.packetBuffer.index; diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java index eb4b7f01a1..c5b54db627 100644 --- a/runescape-client/src/main/java/ParamKeyDefinition.java +++ b/runescape-client/src/main/java/ParamKeyDefinition.java @@ -11,7 +11,6 @@ public class ParamKeyDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jb_m") public static AbstractIndexCache __jb_m; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 14f603392f..296ae184e5 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -23,7 +23,6 @@ public class PcmPlayer { @ObfuscatedGetter( intValue = 1125788887 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( @@ -47,7 +46,6 @@ public class PcmPlayer { @ObfuscatedGetter( intValue = 1907203055 ) - @Export("__y") int __y; @ObfuscatedName("h") @ObfuscatedGetter( @@ -59,13 +57,11 @@ public class PcmPlayer { @ObfuscatedGetter( intValue = 48658021 ) - @Export("__b") int __b; @ObfuscatedName("c") @ObfuscatedGetter( intValue = 1624619697 ) - @Export("__c") int __c; @ObfuscatedName("r") @ObfuscatedGetter( @@ -77,28 +73,23 @@ public class PcmPlayer { @ObfuscatedGetter( longValue = -8188447292076890879L ) - @Export("__p") long __p; @ObfuscatedName("v") - @Export("__v") boolean __v; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -645495803 ) - @Export("__ac") int __ac; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "[Ldc;" ) - @Export("__ay") PcmStream[] __ay; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "[Ldc;" ) - @Export("__ah") PcmStream[] __ah; protected PcmPlayer() { @@ -120,6 +111,7 @@ public class PcmPlayer { signature = "(I)V", garbageValue = "949670609" ) + @Export("init") protected void init() throws Exception { } @@ -128,6 +120,7 @@ public class PcmPlayer { signature = "(II)V", garbageValue = "-1738349775" ) + @Export("open") protected void open(int var1) throws Exception { } @@ -136,11 +129,13 @@ public class PcmPlayer { signature = "(B)I", garbageValue = "0" ) + @Export("position") protected int position() throws Exception { return this.capacity; } @ObfuscatedName("w") + @Export("write") protected void write() throws Exception { } @@ -149,6 +144,7 @@ public class PcmPlayer { signature = "(I)V", garbageValue = "244995961" ) + @Export("close") protected void close() { } @@ -157,6 +153,7 @@ public class PcmPlayer { signature = "(I)V", garbageValue = "-191421600" ) + @Export("discard") protected void discard() throws Exception { } @@ -268,7 +265,6 @@ public class PcmPlayer { signature = "(I)V", garbageValue = "-922069005" ) - @Export("__ac_176") public final void __ac_176() { this.__v = true; } @@ -459,7 +455,6 @@ public class PcmPlayer { signature = "(Ldc;II)V", garbageValue = "-1884182540" ) - @Export("__ab_177") final void __ab_177(PcmStream var1, int var2) { int var3 = var2 >> 5; PcmStream var4 = this.__ah[var3]; diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 5f8a04d8d4..0518a56eee 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -16,7 +16,6 @@ public abstract class PcmStream extends Node { @Export("after") PcmStream after; @ObfuscatedName("s") - @Export("__s") int __s; @ObfuscatedName("t") @ObfuscatedSignature( @@ -33,12 +32,14 @@ public abstract class PcmStream extends Node { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("firstSubStream") protected abstract PcmStream firstSubStream(); @ObfuscatedName("g") @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("nextSubStream") protected abstract PcmStream nextSubStream(); @ObfuscatedName("l") diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 0eeb230c0d..205d7ca61f 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -16,13 +16,10 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "Lje;" ) - @Export("__f") NodeDeque __f; @ObfuscatedName("q") - @Export("__q") int __q; @ObfuscatedName("o") - @Export("__o") int __o; public PcmStreamMixer() { @@ -51,7 +48,6 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("q") - @Export("__q_168") void __q_168() { if(this.__q > 0) { for(PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.__f.last(); var1 != null; var1 = (PcmStreamMixerListener)this.__f.previous()) { @@ -68,7 +64,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "(Lgw;Ldf;)V" ) - @Export("__w_169") void __w_169(Node var1, PcmStreamMixerListener var2) { while(this.__f.sentinel != var1 && ((PcmStreamMixerListener)var1).__m <= var2.__m) { var1 = var1.previous; @@ -82,7 +77,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "(Ldf;)V" ) - @Export("__o_170") void __o_170(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); @@ -114,13 +108,11 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("l") - @Export("__l_171") protected int __l_171() { return 0; } @ObfuscatedName("e") - @Export("__e_172") public final synchronized void __e_172(int[] var1, int var2, int var3) { do { if(this.__o < 0) { @@ -165,7 +157,6 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("d") - @Export("__d_173") public final synchronized void __d_173(int var1) { do { if(this.__o < 0) { diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index a87a239cc6..4e696ca7c1 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { @ObfuscatedName("m") - @Export("__m") int __m; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index a94c76d1e9..6a8fa2e1dd 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -11,121 +11,96 @@ public class PlatformInfo extends Node { @ObfuscatedGetter( intValue = 1318366785 ) - @Export("__ay") int __ay; @ObfuscatedName("ah") - @Export("__ah") boolean __ah; @ObfuscatedName("ak") @ObfuscatedGetter( intValue = 703904161 ) - @Export("__ak") int __ak; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = 467004305 ) - @Export("__aw") int __aw; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 2097018521 ) - @Export("__al") int __al; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -1667177301 ) - @Export("__ab") int __ab; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 385109109 ) - @Export("__ae") int __ae; @ObfuscatedName("at") - @Export("__at") boolean __at; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -1765017 ) - @Export("__ad") int __ad; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = -817941105 ) - @Export("__ap") int __ap; @ObfuscatedName("am") @ObfuscatedGetter( intValue = 30207059 ) - @Export("__am") int __am; @ObfuscatedName("an") @ObfuscatedGetter( intValue = 890109053 ) - @Export("__an") int __an; @ObfuscatedName("az") - @Export("__az") String __az; @ObfuscatedName("au") - @Export("__au") String __au; @ObfuscatedName("ao") - @Export("__ao") String __ao; @ObfuscatedName("aa") - @Export("__aa") String __aa; @ObfuscatedName("ax") @ObfuscatedGetter( intValue = 871094255 ) - @Export("__ax") int __ax; @ObfuscatedName("af") @ObfuscatedGetter( intValue = 1955966365 ) - @Export("__af") int __af; @ObfuscatedName("ai") @ObfuscatedGetter( intValue = 1196598207 ) - @Export("__ai") int __ai; @ObfuscatedName("ba") @ObfuscatedGetter( intValue = -170839105 ) - @Export("__ba") int __ba; @ObfuscatedName("bb") - @Export("__bb") String __bb; @ObfuscatedName("bs") - @Export("__bs") String __bs; @ObfuscatedName("bq") - @Export("__bq") int[] __bq; @ObfuscatedName("bn") @ObfuscatedGetter( intValue = 1466207635 ) - @Export("__bn") int __bn; @ObfuscatedName("bk") - @Export("__bk") String __bk; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) { diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index d242931c4b..54cb0e8f4d 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -74,7 +74,6 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 665272587 ) - @Export("__k") int __k; @ObfuscatedName("n") @ObfuscatedGetter( @@ -86,7 +85,6 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = -1771431457 ) - @Export("__i") int __i; @ObfuscatedName("a") @ObfuscatedSignature( @@ -98,25 +96,21 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 1610462047 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 224552403 ) - @Export("__j") int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 305969541 ) - @Export("__s") int __s; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 892671055 ) - @Export("__t") int __t; @ObfuscatedName("y") @Export("isUnanimated") @@ -155,7 +149,6 @@ public final class Player extends Actor { @Export("isInClanChat") TriBool isInClanChat; @ObfuscatedName("ag") - @Export("__ag") boolean __ag; @ObfuscatedName("aq") @ObfuscatedGetter( @@ -451,7 +444,6 @@ public final class Player extends Actor { signature = "(IIBI)V", garbageValue = "-2066158770" ) - @Export("__x_130") final void __x_130(int var1, int var2, byte var3) { if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) { super.sequence = -1; @@ -496,7 +488,6 @@ public final class Player extends Actor { signature = "(IIBI)V", garbageValue = "-1280043751" ) - @Export("__a_131") final void __a_131(int var1, int var2, byte var3) { if(super.pathLength < 9) { ++super.pathLength; diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 378fa71777..4a360ac4ce 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -8,10 +8,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("PlayerAppearance") public class PlayerAppearance { @ObfuscatedName("g") - @Export("__hi_g") public static short[] __hi_g; @ObfuscatedName("d") - @Export("__hi_d") static final int[] __hi_d; @ObfuscatedName("k") @ObfuscatedSignature( @@ -38,13 +36,11 @@ public class PlayerAppearance { @ObfuscatedGetter( longValue = -3506189412688081513L ) - @Export("__o") long __o; @ObfuscatedName("u") @ObfuscatedGetter( longValue = 8217880921734028425L ) - @Export("__u") long __u; static { @@ -57,7 +53,6 @@ public class PlayerAppearance { signature = "([I[IZII)V", garbageValue = "727056871" ) - @Export("__m_385") public void __m_385(int[] var1, int[] var2, boolean var3, int var4) { if(var1 == null) { var1 = new int[12]; @@ -85,7 +80,6 @@ public class PlayerAppearance { signature = "(IZI)V", garbageValue = "-581016899" ) - @Export("__f_386") public void __f_386(int var1, boolean var2) { if(var1 != 1 || !this.isFemale) { int var3 = this.equipment[__hi_d[var1]]; @@ -120,7 +114,6 @@ public class PlayerAppearance { signature = "(IZI)V", garbageValue = "1416503110" ) - @Export("__q_387") public void __q_387(int var1, boolean var2) { int var3 = this.bodyColors[var1]; if(!var2) { @@ -148,7 +141,6 @@ public class PlayerAppearance { signature = "(ZB)V", garbageValue = "-90" ) - @Export("__w_388") public void __w_388(boolean var1) { if(this.isFemale != var1) { this.__m_385((int[])null, this.bodyColors, var1, -1); @@ -160,7 +152,6 @@ public class PlayerAppearance { signature = "(Lgr;I)V", garbageValue = "779254645" ) - @Export("__o_389") public void __o_389(Buffer var1) { var1.writeByte(this.isFemale?1:0); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 2cf176aa29..8d3c185b3e 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -45,7 +45,6 @@ public enum PlayerType implements Enumerated { @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); @ObfuscatedName("ak") - @Export("__ij_ak") static Image __ij_ak; @ObfuscatedName("g") @ObfuscatedGetter( @@ -78,6 +77,7 @@ public enum PlayerType implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; } @@ -87,6 +87,7 @@ public enum PlayerType implements Enumerated { signature = "(II)V", garbageValue = "300731074" ) + @Export("clearItemContainer") static void clearItemContainer(int var0) { ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if(var1 != null) { diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 0b8eca1f88..5a6fc3c3c4 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -10,16 +10,13 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Players") public class Players { @ObfuscatedName("q") - @Export("__cq_q") static byte[] __cq_q; @ObfuscatedName("w") - @Export("__cq_w") static byte[] __cq_w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "[Lgr;" ) - @Export("__cq_o") static Buffer[] __cq_o; @ObfuscatedName("u") @ObfuscatedGetter( @@ -34,10 +31,8 @@ public class Players { @ObfuscatedGetter( intValue = 945250525 ) - @Export("__cq_l") static int __cq_l; @ObfuscatedName("e") - @Export("__cq_e") static int[] __cq_e; @ObfuscatedName("x") @Export("Players_regions") @@ -52,16 +47,13 @@ public class Players { @ObfuscatedGetter( intValue = -22568397 ) - @Export("__cq_n") static int __cq_n; @ObfuscatedName("i") - @Export("__cq_i") static int[] __cq_i; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lgr;" ) - @Export("__cq_a") static Buffer __cq_a; @ObfuscatedName("y") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 8d6e496e77..e3e2945ea1 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -231,6 +231,7 @@ public final class Projectile extends Entity { signature = "(I)Ldu;", garbageValue = "-2134947096" ) + @Export("getModel") protected final Model getModel() { SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id); Model var2 = var1.getModel(this.frame); diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 4961433783..1de95514a1 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -51,6 +51,7 @@ public final class RasterProvider extends AbstractRasterProvider { signature = "(III)V", garbageValue = "-430495007" ) + @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component0.getGraphics(), var1, var2); } @@ -60,6 +61,7 @@ public final class RasterProvider extends AbstractRasterProvider { signature = "(IIIIB)V", garbageValue = "18" ) + @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component0.getGraphics(), var1, var2, var3, var4); } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 1bdd13aad5..b242467b4e 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -7,16 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("m") - @Export("__et_m") static boolean __et_m; @ObfuscatedName("f") - @Export("__et_f") static boolean __et_f; @ObfuscatedName("q") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; @ObfuscatedName("w") - @Export("__et_w") public static boolean __et_w; @ObfuscatedName("o") @Export("Rasterizer3D_alpha") @@ -61,10 +58,8 @@ public class Rasterizer3D extends Rasterizer2D { @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; @ObfuscatedName("r") - @Export("__et_r") static int[] __et_r; @ObfuscatedName("p") - @Export("__et_p") static int[] __et_p; @ObfuscatedName("v") @Export("Rasterizer3D_sine") @@ -3428,21 +3423,25 @@ public class Rasterizer3D extends Rasterizer2D { } @ObfuscatedName("p") + @Export("rot3") static final int rot3(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; } @ObfuscatedName("v") + @Export("rot4") static final int rot4(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } @ObfuscatedName("ag") + @Export("rot1") static final int rot1(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } @ObfuscatedName("aq") + @Export("rot2") static final int rot2(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 0003108d4f..2bc138ada2 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -7,25 +7,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { @ObfuscatedName("m") - @Export("__m") int __m; @ObfuscatedName("f") - @Export("__f") int __f; @ObfuscatedName("q") - @Export("__q") int __q; @ObfuscatedName("o") - @Export("__o") int __o; @ObfuscatedName("u") - @Export("__u") int __u; @ObfuscatedName("g") - @Export("__g") int __g; @ObfuscatedName("l") - @Export("__l") int __l; @ObfuscatedName("e") @Export("numLoops") @@ -37,18 +30,14 @@ public class RawPcmStream extends PcmStream { @Export("end") int end; @ObfuscatedName("k") - @Export("__k") boolean __k; @ObfuscatedName("n") int __n; @ObfuscatedName("i") - @Export("__i") int __i; @ObfuscatedName("a") - @Export("__a") int __a; @ObfuscatedName("z") - @Export("__z") int __z; @ObfuscatedSignature( @@ -82,7 +71,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("o") - @Export("__o_180") void __o_180() { this.__u = this.__q; this.__g = method2603(this.__q, this.__o); @@ -93,6 +81,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } @@ -101,6 +90,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldc;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } @@ -473,19 +463,16 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("a") - @Export("__a_182") public synchronized void __a_182(int var1) { this.__j_184(var1 << 6, this.__t_186()); } @ObfuscatedName("z") - @Export("__z_183") synchronized void __z_183(int var1) { this.__j_184(var1, this.__t_186()); } @ObfuscatedName("j") - @Export("__j_184") synchronized void __j_184(int var1, int var2) { this.__q = var1; this.__o = var2; @@ -494,19 +481,16 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("s") - @Export("__s_185") public synchronized int __s_185() { return this.__q == Integer.MIN_VALUE?0:this.__q; } @ObfuscatedName("t") - @Export("__t_186") public synchronized int __t_186() { return this.__o < 0?-1:this.__o; } @ObfuscatedName("y") - @Export("__y_187") public synchronized void __y_187(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if(var1 < -1) { @@ -525,14 +509,12 @@ public class RawPcmStream extends PcmStream { signature = "(Z)V", garbageValue = "1" ) - @Export("__h_188") public synchronized void __h_188() { this.__f = (this.__f ^ this.__f >> 31) + (this.__f >>> 31); this.__f = -this.__f; } @ObfuscatedName("b") - @Export("__b_189") void __b_189() { if(this.__n != 0) { if(this.__q == Integer.MIN_VALUE) { @@ -546,13 +528,11 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("c") - @Export("__c_190") public synchronized void __c_190(int var1, int var2) { this.__p_191(var1, var2, this.__t_186()); } @ObfuscatedName("p") - @Export("__p_191") public synchronized void __p_191(int var1, int var2, int var3) { if(var1 == 0) { this.__j_184(var2, var3); @@ -598,7 +578,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("v") - @Export("__v_192") public synchronized void __v_192(int var1) { if(var1 == 0) { this.__z_183(0); @@ -643,7 +622,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("ah") - @Export("__ah_193") public synchronized void __ah_193(int var1) { if(this.__f < 0) { this.__f = -var1; @@ -654,25 +632,21 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("ab") - @Export("__ab_194") public synchronized int __ab_194() { return this.__f < 0?-this.__f:this.__f; } @ObfuscatedName("ae") - @Export("__ae_195") public boolean __ae_195() { return this.__m < 0 || this.__m >= ((RawSound)super.sound).samples.length << 8; } @ObfuscatedName("at") - @Export("__at_196") public boolean __at_196() { return this.__n != 0; } @ObfuscatedName("ad") - @Export("__ad_202") int __ad_202(int[] var1, int var2, int var3, int var4, int var5) { while(true) { if(this.__n > 0) { @@ -723,7 +697,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("ap") - @Export("__ap_203") int __ap_203(int[] var1, int var2, int var3, int var4, int var5) { while(true) { if(this.__n > 0) { @@ -774,7 +747,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("az") - @Export("__az_179") int __az_179() { int var1 = this.__u * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); @@ -788,7 +760,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("au") - @Export("__au_204") boolean __au_204() { int var1 = this.__q; int var2; diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index b9d8fd8a14..e746b0a448 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -19,7 +19,6 @@ public class RawSound extends AbstractSound { @Export("end") int end; @ObfuscatedName("o") - @Export("__o") public boolean __o; RawSound(int var1, byte[] var2, int var3, int var4) { diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java index 4a6349f170..006557d5f8 100644 --- a/runescape-client/src/main/java/RectangleMode.java +++ b/runescape-client/src/main/java/RectangleMode.java @@ -11,19 +11,16 @@ public enum RectangleMode implements Enumerated { @ObfuscatedSignature( signature = "Llj;" ) - @Export("__lj_m") __lj_m(0, 0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Llj;" ) - @Export("__lj_f") __lj_f(1, 1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Llj;" ) - @Export("__lj_q") __lj_q(2, 2); @ObfuscatedName("d") @Export("musicTrackBoolean") @@ -51,6 +48,7 @@ public enum RectangleMode implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id2; } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 7e8bfe3ebd..47bf872c16 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -13,27 +13,30 @@ public abstract class RouteStrategy @Export("Interpreter_intStackSize") static int Interpreter_intStackSize; @ObfuscatedName("e") - @Export("__fe_e") static byte[][][] __fe_e; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 123677543 ) + @Export("approxDestinationX") public int approxDestinationX; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -2126454535 ) + @Export("approxDestinationY") public int approxDestinationY; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1566880917 ) + @Export("approxDestinationSizeX") public int approxDestinationSizeX; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -2126101601 ) + @Export("approxDestinationSizeY") public int approxDestinationSizeY; @ObfuscatedName("m") @@ -70,6 +73,7 @@ public abstract class RouteStrategy signature = "(Lir;II)Z", garbageValue = "-602741260" ) + @Export("loadSpriteFlat") static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) { byte[] var2 = var0.takeRecordFlat(var1); if(var2 == null) { diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 1f11fe607a..75df0eac82 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -24,7 +24,6 @@ public class RunException extends RuntimeException { @ObfuscatedGetter( intValue = 121013503 ) - @Export("__fx_w") public static int __fx_w; @ObfuscatedName("o") @Export("string") diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 0a4e5bfbce..85a75d1337 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -112,25 +112,18 @@ public class Scene { @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; @ObfuscatedName("au") - @Export("__em_au") static final int[] __em_au; @ObfuscatedName("ao") - @Export("__em_ao") static final int[] __em_ao; @ObfuscatedName("aa") - @Export("__em_aa") static final int[] __em_aa; @ObfuscatedName("ax") - @Export("__em_ax") static final int[] __em_ax; @ObfuscatedName("af") - @Export("__em_af") static final int[] __em_af; @ObfuscatedName("ai") - @Export("__em_ai") static final int[] __em_ai; @ObfuscatedName("ba") - @Export("__em_ba") static final int[] __em_ba; @ObfuscatedName("bc") @Export("visibilityMap") @@ -187,13 +180,10 @@ public class Scene { @Export("tempGameObjects") GameObject[] tempGameObjects; @ObfuscatedName("x") - @Export("__x") int[][][] __x; @ObfuscatedName("bk") - @Export("__bk") int[][] __bk; @ObfuscatedName("bd") - @Export("__bd") int[][] __bd; static { @@ -484,7 +474,6 @@ public class Scene { @ObfuscatedSignature( signature = "(IIIIIILex;IJI)Z" ) - @Export("__d_238") public boolean __d_238(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { if(var7 == null) { return true; @@ -499,7 +488,6 @@ public class Scene { @ObfuscatedSignature( signature = "(IIIIILex;IJZ)Z" ) - @Export("__a_239") public boolean __a_239(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { if(var6 == null) { return true; @@ -538,7 +526,6 @@ public class Scene { @ObfuscatedSignature( signature = "(IIIIILex;IJIIII)Z" ) - @Export("__z_240") public boolean __z_240(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null?true:this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); } @@ -666,7 +653,6 @@ public class Scene { } @ObfuscatedName("y") - @Export("__y_241") public void __y_241(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if(var5 != null) { @@ -697,7 +683,6 @@ public class Scene { } @ObfuscatedName("c") - @Export("__c_242") public void __c_242(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if(var4 != null) { @@ -757,7 +742,6 @@ public class Scene { @ObfuscatedSignature( signature = "(III)Leh;" ) - @Export("__aj_243") public GameObject __aj_243(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if(var4 == null) { @@ -788,21 +772,18 @@ public class Scene { } @ObfuscatedName("ar") - @Export("__ar_244") public long __ar_244(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.boundaryObject != null?var4.boundaryObject.tag:0L; } @ObfuscatedName("ac") - @Export("__ac_245") public long __ac_245(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 != null && var4.wallDecoration != null?var4.wallDecoration.tag:0L; } @ObfuscatedName("ay") - @Export("__ay_246") public long __ay_246(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if(var4 == null) { @@ -853,7 +834,6 @@ public class Scene { } @ObfuscatedName("aw") - @Export("__aw_247") public void __aw_247(int var1, int var2, int var3) { for(int var4 = 0; var4 < this.planes; ++var4) { for(int var5 = 0; var5 < this.xSize; ++var5) { @@ -901,7 +881,6 @@ public class Scene { @ObfuscatedSignature( signature = "(Ldw;III)V" ) - @Export("__al_248") void __al_248(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; @@ -943,7 +922,6 @@ public class Scene { @ObfuscatedSignature( signature = "(Ldw;IIIII)V" ) - @Export("__ab_249") void __ab_249(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; @@ -1076,7 +1054,6 @@ public class Scene { } @ObfuscatedName("as") - @Export("__as_250") public void __as_250() { viewportWalking = true; } @@ -2148,7 +2125,6 @@ public class Scene { } @ObfuscatedName("ba") - @Export("__ba_253") boolean __ba_253(int var1, int var2, int var3) { int var4 = this.__x[var1][var2][var3]; if(var4 == -Scene_drawnCount) { @@ -2169,7 +2145,6 @@ public class Scene { } @ObfuscatedName("bb") - @Export("__bb_254") boolean __bb_254(int var1, int var2, int var3, int var4) { if(!this.__ba_253(var1, var2, var3)) { return false; @@ -2315,7 +2290,6 @@ public class Scene { } @ObfuscatedName("bs") - @Export("__bs_255") boolean __bs_255(int var1, int var2, int var3, int var4) { if(!this.__ba_253(var1, var2, var3)) { return false; @@ -2327,7 +2301,6 @@ public class Scene { } @ObfuscatedName("bq") - @Export("__bq_256") boolean __bq_256(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; @@ -2372,7 +2345,6 @@ public class Scene { } @ObfuscatedName("bn") - @Export("__bn_257") boolean __bn_257(int var1, int var2, int var3) { for(int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index db25a3418e..585a8793b2 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -62,7 +62,6 @@ public class Script extends DualNode { signature = "(II)[Llh;", garbageValue = "-729647116" ) - @Export("__o_164") IterableNodeHashTable[] __o_164(int var1) { return new IterableNodeHashTable[var1]; } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 2ba2514916..a772be2e8d 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -74,7 +74,6 @@ public class ScriptEvent extends Node { @ObfuscatedGetter( intValue = -2138736593 ) - @Export("__d") int __d; @ObfuscatedName("k") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 2e3d8fb8bd..0223305001 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -17,13 +17,11 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jh_f") public static AbstractIndexCache __jh_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jh_q") public static AbstractIndexCache __jh_q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -35,7 +33,6 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - @Export("__jh_o") public static EvictingDualNodeHashTable __jh_o; @ObfuscatedName("u") @Export("frameIds") @@ -47,7 +44,6 @@ public class SequenceDefinition extends DualNode { @Export("frameLengths") public int[] frameLengths; @ObfuscatedName("e") - @Export("__e") public int[] __e; @ObfuscatedName("x") @ObfuscatedGetter( @@ -56,16 +52,13 @@ public class SequenceDefinition extends DualNode { @Export("frameCount") public int frameCount; @ObfuscatedName("d") - @Export("__d") int[] __d; @ObfuscatedName("k") - @Export("__k") public boolean __k; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1309695045 ) - @Export("__n") public int __n; @ObfuscatedName("i") @ObfuscatedGetter( @@ -83,25 +76,21 @@ public class SequenceDefinition extends DualNode { @ObfuscatedGetter( intValue = -28345361 ) - @Export("__z") public int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = 1339014215 ) - @Export("__j") public int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 2012242069 ) - @Export("__s") public int __s; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1147391369 ) - @Export("__t") public int __t; static { diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index 30b828ab0f..cf133ba7c4 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -11,25 +11,21 @@ public class ServerBuild { @ObfuscatedSignature( signature = "Liy;" ) - @Export("__iy_m") public static final ServerBuild __iy_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Liy;" ) - @Export("__iy_f") public static final ServerBuild __iy_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Liy;" ) - @Export("__iy_q") public static final ServerBuild __iy_q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Liy;" ) - @Export("__iy_w") public static final ServerBuild __iy_w; @ObfuscatedName("bx") @Export("worldsUrl") @@ -38,7 +34,6 @@ public class ServerBuild { @ObfuscatedGetter( intValue = -365366303 ) - @Export("__iy_lo") static int __iy_lo; @ObfuscatedName("o") @Export("name") diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 27740a02bf..c0df9ef55c 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -11,511 +11,426 @@ public class ServerPacket { @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_m") public static final ServerPacket __ge_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_f") public static final ServerPacket __ge_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_q") public static final ServerPacket __ge_q; @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_w") public static final ServerPacket __ge_w; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_o") public static final ServerPacket __ge_o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_u") public static final ServerPacket __ge_u; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_g") public static final ServerPacket __ge_g; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_l") public static final ServerPacket __ge_l; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_e") public static final ServerPacket __ge_e; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_x") public static final ServerPacket __ge_x; @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_d") public static final ServerPacket __ge_d; @ObfuscatedName("k") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_k") public static final ServerPacket __ge_k; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_n") public static final ServerPacket __ge_n; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_i") public static final ServerPacket __ge_i; @ObfuscatedName("a") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_a") public static final ServerPacket __ge_a; @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_z") public static final ServerPacket __ge_z; @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_j") public static final ServerPacket __ge_j; @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_s") public static final ServerPacket __ge_s; @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_t") public static final ServerPacket __ge_t; @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_y") public static final ServerPacket __ge_y; @ObfuscatedName("h") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_h") public static final ServerPacket __ge_h; @ObfuscatedName("b") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_b") public static final ServerPacket __ge_b; @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_c") public static final ServerPacket __ge_c; @ObfuscatedName("r") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_r") public static final ServerPacket __ge_r; @ObfuscatedName("p") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_p") public static final ServerPacket __ge_p; @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_v") public static final ServerPacket __ge_v; @ObfuscatedName("ag") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ag") public static final ServerPacket __ge_ag; @ObfuscatedName("aq") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_aq") public static final ServerPacket __ge_aq; @ObfuscatedName("aj") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_aj") public static final ServerPacket __ge_aj; @ObfuscatedName("av") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_av") public static final ServerPacket __ge_av; @ObfuscatedName("ar") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ar") public static final ServerPacket __ge_ar; @ObfuscatedName("ac") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ac") public static final ServerPacket __ge_ac; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ay") public static final ServerPacket __ge_ay; @ObfuscatedName("ah") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ah") public static final ServerPacket __ge_ah; @ObfuscatedName("ak") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ak") public static final ServerPacket __ge_ak; @ObfuscatedName("aw") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_aw") public static final ServerPacket __ge_aw; @ObfuscatedName("al") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_al") public static final ServerPacket __ge_al; @ObfuscatedName("ab") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ab") public static final ServerPacket __ge_ab; @ObfuscatedName("ae") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ae") public static final ServerPacket __ge_ae; @ObfuscatedName("at") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_at") public static final ServerPacket __ge_at; @ObfuscatedName("ad") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ad") public static final ServerPacket __ge_ad; @ObfuscatedName("ap") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ap") public static final ServerPacket __ge_ap; @ObfuscatedName("as") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_as") public static final ServerPacket __ge_as; @ObfuscatedName("am") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_am") public static final ServerPacket __ge_am; @ObfuscatedName("an") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_an") public static final ServerPacket __ge_an; @ObfuscatedName("az") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_az") public static final ServerPacket __ge_az; @ObfuscatedName("au") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_au") public static final ServerPacket __ge_au; @ObfuscatedName("ao") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ao") public static final ServerPacket __ge_ao; @ObfuscatedName("aa") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_aa") public static final ServerPacket __ge_aa; @ObfuscatedName("ax") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ax") public static final ServerPacket __ge_ax; @ObfuscatedName("af") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_af") public static final ServerPacket __ge_af; @ObfuscatedName("ai") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ai") public static final ServerPacket __ge_ai; @ObfuscatedName("ba") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ba") public static final ServerPacket __ge_ba; @ObfuscatedName("bb") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bb") public static final ServerPacket __ge_bb; @ObfuscatedName("bs") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bs") public static final ServerPacket __ge_bs; @ObfuscatedName("bq") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bq") public static final ServerPacket __ge_bq; @ObfuscatedName("bn") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bn") public static final ServerPacket __ge_bn; @ObfuscatedName("bk") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bk") public static final ServerPacket __ge_bk; @ObfuscatedName("bd") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bd") public static final ServerPacket __ge_bd; @ObfuscatedName("bc") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bc") public static final ServerPacket __ge_bc; @ObfuscatedName("bo") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bo") public static final ServerPacket __ge_bo; @ObfuscatedName("bx") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bx") public static final ServerPacket __ge_bx; @ObfuscatedName("by") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_by") public static final ServerPacket __ge_by; @ObfuscatedName("bu") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bu") public static final ServerPacket __ge_bu; @ObfuscatedName("bm") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bm") public static final ServerPacket __ge_bm; @ObfuscatedName("bl") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bl") public static final ServerPacket __ge_bl; @ObfuscatedName("br") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_br") public static final ServerPacket __ge_br; @ObfuscatedName("bj") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bj") public static final ServerPacket __ge_bj; @ObfuscatedName("bi") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bi") public static final ServerPacket __ge_bi; @ObfuscatedName("bz") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bz") public static final ServerPacket __ge_bz; @ObfuscatedName("bg") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bg") public static final ServerPacket __ge_bg; @ObfuscatedName("bt") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bt") public static final ServerPacket __ge_bt; @ObfuscatedName("bp") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bp") public static final ServerPacket __ge_bp; @ObfuscatedName("bf") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bf") public static final ServerPacket __ge_bf; @ObfuscatedName("bh") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bh") public static final ServerPacket __ge_bh; @ObfuscatedName("be") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_be") public static final ServerPacket __ge_be; @ObfuscatedName("bv") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bv") public static final ServerPacket __ge_bv; @ObfuscatedName("bw") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_bw") public static final ServerPacket __ge_bw; @ObfuscatedName("cr") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_cr") public static final ServerPacket __ge_cr; @ObfuscatedName("cv") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_cv") public static final ServerPacket __ge_cv; @ObfuscatedName("ce") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_ce") public static final ServerPacket __ge_ce; @ObfuscatedName("cy") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_cy") public static final ServerPacket __ge_cy; @ObfuscatedName("cs") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_cs") public static final ServerPacket __ge_cs; @ObfuscatedName("cm") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_cm") public static final ServerPacket __ge_cm; @ObfuscatedName("cj") @ObfuscatedSignature( signature = "Lge;" ) - @Export("__ge_cj") public static final ServerPacket __ge_cj; @ObfuscatedName("ix") @ObfuscatedGetter( @@ -634,6 +549,7 @@ public class ServerPacket { signature = "(I)Llq;", garbageValue = "2048918805" ) + @Export("createIndexedSprite") static IndexedSprite createIndexedSprite() { IndexedSprite var0 = new IndexedSprite(); var0.width = class328.indexedSpriteWidth; diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index eb49ea8c5a..5fc72906be 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -11,7 +11,6 @@ public class Skeleton extends Node { @ObfuscatedGetter( intValue = 2096389021 ) - @Export("__ek_x") static int __ek_x; @ObfuscatedName("dc") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 469999c36d..ae1e7c6b0a 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -13,7 +13,6 @@ public class Skills { @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @ObfuscatedName("ef") - @Export("__hc_ef") static int[] __hc_ef; static { diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index ce8bf940a1..5c1c0cc0ed 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -16,11 +16,13 @@ public class SoftWrapper extends Wrapper { } @ObfuscatedName("m") + @Export("get") Object get() { return this.ref.get(); } @ObfuscatedName("f") + @Export("isSoft") boolean isSoft() { return true; } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 79e06ab3c7..f443c3306f 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -49,7 +49,6 @@ public class SoundEffect { } @ObfuscatedName("q") - @Export("__q_174") public final int __q_174() { int var1 = 9999999; diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index b690fbb072..84807ce61c 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -83,13 +83,11 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedGetter( intValue = -20619847 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1866148625 ) - @Export("__z") int __z; static { diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 5a94baf1d4..d56f907f4a 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -108,7 +108,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("o") - @Export("__o_499") public void __o_499(int var1) { if(this.subWidth != this.width || this.subHeight != this.height) { int var2 = var1; @@ -150,7 +149,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("u") - @Export("__u_500") public void __u_500() { int[] var1 = new int[this.subWidth * this.subHeight]; int var2 = 0; @@ -166,7 +164,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("g") - @Export("__g_501") public void __g_501() { int[] var1 = new int[this.subWidth * this.subHeight]; int var2 = 0; @@ -182,7 +179,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("l") - @Export("__l_502") public void __l_502(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; int var3 = 0; @@ -210,7 +206,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("e") - @Export("__e_503") public void __e_503(int var1) { for(int var2 = this.subHeight - 1; var2 > 0; --var2) { int var3 = var2 * this.subWidth; @@ -317,7 +312,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("j") - @Export("__j_506") public void __j_506(int var1, int var2, int var3, int var4) { if(var3 > 0 && var4 > 0) { int var5 = this.subWidth; @@ -432,7 +426,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("h") - @Export("__h_508") public void __h_508(int var1, int var2, int var3) { var1 += this.yOffset; var2 += this.xOffset; @@ -478,7 +471,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("c") - @Export("__c_509") public void __c_509(int var1, int var2, int var3, int var4, int var5) { if(var3 > 0 && var4 > 0) { int var6 = this.subWidth; @@ -543,7 +535,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("v") - @Export("__v_510") public void __v_510(int var1, int var2, int var3) { var1 += this.yOffset; var2 += this.xOffset; @@ -594,7 +585,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("aj") - @Export("__aj_511") public void __aj_511(int var1, int var2, int var3, int var4, int var5) { if(var3 > 0 && var4 > 0) { int var6 = this.subWidth; @@ -664,7 +654,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("ac") - @Export("__ac_512") public void __ac_512(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0?-var2:0; int var10 = var2 + this.subHeight <= var6?this.subHeight:var6 - var2; @@ -713,7 +702,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("ay") - @Export("__ay_513") public void __ay_513(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { int var11 = -var3 / 2; @@ -749,7 +737,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("ah") - @Export("__ah_514") public void __ah_514(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; @@ -790,13 +777,11 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("ak") - @Export("__ak_515") public void __ak_515(int var1, int var2, int var3, int var4) { this.__aw_516(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } @ObfuscatedName("aw") - @Export("__aw_516") void __aw_516(int var1, int var2, int var3, int var4, int var5, int var6) { if(var6 != 0) { var1 -= this.yOffset << 4; @@ -1266,7 +1251,6 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("al") - @Export("__al_517") public void __al_517(int var1, int var2, int var3, int var4) { if(var3 <= this.width && var4 <= this.height) { int var5 = var3 * this.yOffset / this.width + var1; diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index 2fba5062e2..e0db3df86e 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -11,13 +11,11 @@ public class SpriteIds { @ObfuscatedGetter( intValue = 1673796151 ) - @Export("__m") public int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 159591367 ) - @Export("__f") public int __f; @ObfuscatedName("q") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index f6e81e2c1b..abcc91283c 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -95,6 +95,7 @@ public class SpriteMask extends DualNode { signature = "(Lir;IIB)Z", garbageValue = "1" ) + @Export("loadSprite") public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) { byte[] var3 = var0.takeRecord(var1, var2); if(var3 == null) { diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 25f84bfa89..a0c5f48aac 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -7,19 +7,14 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Strings") public class Strings { @ObfuscatedName("bq") - @Export("__id_bq") public static String __id_bq; @ObfuscatedName("cp") - @Export("__id_cp") public static String __id_cp; @ObfuscatedName("jr") - @Export("__id_jr") public static String __id_jr; @ObfuscatedName("jv") - @Export("__id_jv") public static String __id_jv; @ObfuscatedName("ju") - @Export("__id_ju") public static String __id_ju; static { diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 21848a13cd..898e0a5a9c 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -10,13 +10,11 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__jq_m") public static AbstractIndexCache __jq_m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Ler;" ) - @Export("__jq_f") public static EvictingDualNodeHashTable __jq_f; @ObfuscatedName("q") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 6f03e0a231..4e175febd8 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -11,37 +11,31 @@ public enum StudioGame implements Enumerated { @ObfuscatedSignature( signature = "Lis;" ) - @Export("__is_m") __is_m("runescape", "RuneScape", 0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lis;" ) - @Export("__is_f") __is_f("stellardawn", "Stellar Dawn", 1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lis;" ) - @Export("__is_q") __is_q("game3", "Game 3", 2), @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lis;" ) - @Export("__is_w") __is_w("game4", "Game 4", 3), @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lis;" ) - @Export("__is_o") __is_o("game5", "Game 5", 4), @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lis;" ) - @Export("__is_u") __is_u("oldscape", "RuneScape 2007", 5); @ObfuscatedName("g") @@ -64,7 +58,7 @@ public enum StudioGame implements Enumerated { signature = "(B)I", garbageValue = "83" ) - @Export("ordinal") + @Export("rsOrdinal") public int rsOrdinal() { return this.id; } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index ee59d8609c..b17f92e690 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -13,19 +13,15 @@ public class Texture extends Node { @Export("int1") int int1; @ObfuscatedName("u") - @Export("__u") boolean __u; @ObfuscatedName("g") @Export("records") int[] records; @ObfuscatedName("l") - @Export("__l") int[] __l; @ObfuscatedName("e") - @Export("__e") int[] __e; @ObfuscatedName("x") - @Export("__x") int[] __x; @ObfuscatedName("d") @Export("animationDirection") @@ -90,7 +86,6 @@ public class Texture extends Node { @ObfuscatedSignature( signature = "(DILir;)Z" ) - @Export("__m_230") boolean __m_230(double var1, int var3, AbstractIndexCache var4) { int var5; for(var5 = 0; var5 < this.records.length; ++var5) { diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 7f200191c0..7656d33409 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.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,6 +11,7 @@ public interface TextureLoader { signature = "(II)[I", garbageValue = "-905309626" ) + @Export("load") int[] load(int var1); @ObfuscatedName("w") @@ -31,5 +33,6 @@ public interface TextureLoader { signature = "(II)Z", garbageValue = "-1427873761" ) + @Export("isLowDetail") boolean isLowDetail(int var1); } diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index ace01a418a..da771e9d17 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -82,7 +82,6 @@ public class TextureProvider implements TextureLoader { signature = "(I)I", garbageValue = "-1996487053" ) - @Export("__m_212") public int __m_212() { int var1 = 0; int var2 = 0; @@ -155,7 +154,6 @@ public class TextureProvider implements TextureLoader { signature = "(II)I", garbageValue = "-1641984961" ) - @Export("__w_213") public int __w_213(int var1) { return this.textures[var1] != null?this.textures[var1].int1:0; } @@ -165,7 +163,6 @@ public class TextureProvider implements TextureLoader { signature = "(IB)Z", garbageValue = "14" ) - @Export("__o_214") public boolean __o_214(int var1) { return this.textures[var1].__u; } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 267f110068..8a2336572e 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -113,19 +113,16 @@ public final class Tile extends Node { @ObfuscatedGetter( intValue = 1724493981 ) - @Export("__y") int __y; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -172066661 ) - @Export("__h") int __h; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 2030010491 ) - @Export("__b") int __b; @ObfuscatedName("c") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/TileLocation.java b/runescape-client/src/main/java/TileLocation.java index acb6f0c94a..35e6007294 100644 --- a/runescape-client/src/main/java/TileLocation.java +++ b/runescape-client/src/main/java/TileLocation.java @@ -82,19 +82,16 @@ public class TileLocation { return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } - @Export("__equals_382") @ObfuscatedName("equals") public boolean __equals_382(Object var1) { return this == var1?true:(!(var1 instanceof TileLocation)?false:this.equals0((TileLocation)var1)); } - @Export("__hashCode_383") @ObfuscatedName("hashCode") public int __hashCode_383() { return this.packed(); } - @Export("__toString_384") @ObfuscatedName("toString") public String __toString_384() { return this.toString0(","); diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 5f6589ce02..43694cdb9b 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -6,25 +6,18 @@ import net.runelite.mapping.ObfuscatedName; @Implements("TileModel") public final class TileModel { @ObfuscatedName("z") - @Export("__dv_z") static int[] __dv_z; @ObfuscatedName("j") - @Export("__dv_j") static int[] __dv_j; @ObfuscatedName("s") - @Export("__dv_s") static int[] __dv_s; @ObfuscatedName("t") - @Export("__dv_t") static int[] __dv_t; @ObfuscatedName("y") - @Export("__dv_y") static int[] __dv_y; @ObfuscatedName("h") - @Export("__dv_h") static final int[][] __dv_h; @ObfuscatedName("b") - @Export("__dv_b") static final int[][] __dv_b; @ObfuscatedName("m") @Export("vertexX") diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 0a2baa9bb2..e63ed8340a 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -11,7 +11,6 @@ public final class TilePaint { @ObfuscatedSignature( signature = "Lla;" ) - @Export("__eb_ah") static Bounds __eb_ah; @ObfuscatedName("m") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 4800cf2d76..2c80cd3d1a 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -20,43 +20,32 @@ public final class Tiles { @Export("Tiles_minPlane") static int Tiles_minPlane; @ObfuscatedName("w") - @Export("__bq_w") static byte[][][] __bq_w; @ObfuscatedName("l") - @Export("__bq_l") static byte[][][] __bq_l; @ObfuscatedName("a") - @Export("__bq_a") static int[][][] __bq_a; @ObfuscatedName("t") - @Export("__bq_t") static final int[] __bq_t; @ObfuscatedName("y") - @Export("__bq_y") static final int[] __bq_y; @ObfuscatedName("h") - @Export("__bq_h") static final int[] __bq_h; @ObfuscatedName("b") - @Export("__bq_b") static final int[] __bq_b; @ObfuscatedName("c") - @Export("__bq_c") static final int[] __bq_c; @ObfuscatedName("r") - @Export("__bq_r") static final int[] __bq_r; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -2142579405 ) - @Export("__bq_p") static int __bq_p; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 834543729 ) - @Export("__bq_v") static int __bq_v; static { @@ -93,6 +82,7 @@ public final class Tiles { signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", garbageValue = "-1525245246" ) + @Export("insertMenuItemNoShift") public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { class16.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 31fecfa510..97088532cc 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -11,58 +11,48 @@ public class Timer { @ObfuscatedGetter( longValue = 6181704275746246665L ) - @Export("__m") long __m; @ObfuscatedName("f") @ObfuscatedGetter( longValue = -8166664055136527097L ) - @Export("__f") long __f; @ObfuscatedName("q") - @Export("__q") public boolean __q; @ObfuscatedName("w") @ObfuscatedGetter( longValue = -6206176920376957899L ) - @Export("__w") long __w; @ObfuscatedName("o") @ObfuscatedGetter( longValue = -5820022560321695785L ) - @Export("__o") long __o; @ObfuscatedName("u") @ObfuscatedGetter( longValue = -7044840680232740733L ) - @Export("__u") long __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -500639955 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 2043109577 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 978183419 ) - @Export("__e") int __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1684916659 ) - @Export("__x") int __x; public Timer() { @@ -83,7 +73,6 @@ public class Timer { signature = "(I)V", garbageValue = "2027048361" ) - @Export("__m_453") public void __m_453() { this.__m = class203.currentTimeMs(); } @@ -93,7 +82,6 @@ public class Timer { signature = "(B)V", garbageValue = "3" ) - @Export("__f_454") public void __f_454() { if(-1L != this.__m) { this.__o = class203.currentTimeMs() - this.__m; @@ -107,7 +95,6 @@ public class Timer { signature = "(II)V", garbageValue = "-1162738177" ) - @Export("__q_455") public void __q_455(int var1) { this.__f = class203.currentTimeMs(); this.__g = var1; @@ -118,7 +105,6 @@ public class Timer { signature = "(I)V", garbageValue = "-1855026926" ) - @Export("__w_456") public void __w_456() { if(this.__f != -1L) { this.__w = class203.currentTimeMs() - this.__f; @@ -134,7 +120,6 @@ public class Timer { signature = "(S)V", garbageValue = "-30171" ) - @Export("__o_457") public void __o_457() { this.__q = false; this.__l = 0; @@ -145,7 +130,6 @@ public class Timer { signature = "(I)V", garbageValue = "-812012402" ) - @Export("__u_458") public void __u_458() { this.__w_456(); } diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java index 2d67699986..14da8aef2c 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/TotalQuantityComparator.java @@ -12,7 +12,6 @@ final class TotalQuantityComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "-573736433" ) - @Export("__m_5") int __m_5(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity?-1:(var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity?0:1); } @@ -23,7 +22,6 @@ final class TotalQuantityComparator implements Comparator { return this.__m_5((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @Export("__equals_7") @ObfuscatedName("equals") public boolean __equals_7(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java index 915d54d60f..57e4706f23 100644 --- a/runescape-client/src/main/java/UnitPriceComparator.java +++ b/runescape-client/src/main/java/UnitPriceComparator.java @@ -25,7 +25,6 @@ final class UnitPriceComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "-120071238" ) - @Export("__m_11") int __m_11(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice?-1:(var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice?0:1); } @@ -36,7 +35,6 @@ final class UnitPriceComparator implements Comparator { return this.__m_11((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @Export("__equals_13") @ObfuscatedName("equals") public boolean __equals_13(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 0c8feaf05e..f34eb61bc9 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -18,13 +18,11 @@ public class UrlRequester implements Runnable { @ObfuscatedGetter( intValue = -883931753 ) - @Export("__eo_u") static int __eo_u; @ObfuscatedName("ak") @ObfuscatedSignature( signature = "Lla;" ) - @Export("__eo_ak") static Bounds __eo_ak; @ObfuscatedName("m") @Export("thread") diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index f7cbf2af65..a289a2a733 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator1(boolean var1) { @@ -20,7 +19,6 @@ public class UserComparator1 implements Comparator { signature = "(Ljs;Ljs;B)I", garbageValue = "68" ) - @Export("__m_476") int __m_476(User var1, User var2) { return this.__m?var1.compareTo0(var2):var2.compareTo0(var1); } @@ -31,7 +29,6 @@ public class UserComparator1 implements Comparator { return this.__m_476((User)var1, (User)var2); } - @Export("__equals_478") @ObfuscatedName("equals") public boolean __equals_478(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index a0b5d7b61c..693298d8ab 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator10(boolean var1) { @@ -20,7 +19,6 @@ public class UserComparator10 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-15" ) - @Export("__m_268") int __m_268(Buddy var1, Buddy var2) { return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2); } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index dd5f73e97d..cf58e0cd5c 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator2") public class UserComparator2 implements Comparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator2(boolean var1) { @@ -20,12 +19,10 @@ public class UserComparator2 implements Comparator { signature = "(Ljs;Ljs;I)I", garbageValue = "-2069683911" ) - @Export("__m_479") int __m_479(User var1, User var2) { return this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username()); } - @Export("__equals_481") @ObfuscatedName("equals") public boolean __equals_481(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index a965353599..f6e38ee6bf 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -19,7 +19,6 @@ public class UserComparator3 extends AbstractUserComparator { @Export("socketTask") static Task socketTask; @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator3(boolean var1) { @@ -31,7 +30,6 @@ public class UserComparator3 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-1157645406" ) - @Export("__m_274") int __m_274(Buddy var1, Buddy var2) { return var2.world0 != var1.world0?(this.__m?var1.world0 - var2.world0:var2.world0 - var1.world0):this.__x_461(var1, var2); } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 54977070b0..b6b05a509f 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -15,7 +15,6 @@ public class UserComparator4 implements Comparator { @Export("WorldMapElement_count") public static int WorldMapElement_count; @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator4(boolean var1) { @@ -27,12 +26,10 @@ public class UserComparator4 implements Comparator { signature = "(Lke;Lke;I)I", garbageValue = "950234237" ) - @Export("__m_261") int __m_261(Buddy var1, Buddy var2) { return this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2; } - @Export("__equals_263") @ObfuscatedName("equals") public boolean __equals_263(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 5a90abe58e..0ee89e85f2 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator5(boolean var1) { @@ -19,7 +18,6 @@ public class UserComparator5 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "-22" ) - @Export("__m_272") int __m_272(Buddy var1, Buddy var2) { if(var1.world0 != 0) { if(var2.world0 == 0) { diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 7f362451fc..90761a877b 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -16,10 +16,8 @@ public class UserComparator6 extends AbstractUserComparator { @ObfuscatedSignature( signature = "Lho;" ) - @Export("__fg_jh") static Widget __fg_jh; @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator6(boolean var1) { @@ -31,7 +29,6 @@ public class UserComparator6 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "750521759" ) - @Export("__m_276") int __m_276(Buddy var1, Buddy var2) { return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2); } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index fb9a9a7e5f..f5387fbc87 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -10,7 +10,6 @@ import net.runelite.rs.Reflection; @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator7(boolean var1) { @@ -22,7 +21,6 @@ public class UserComparator7 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "-9252550" ) - @Export("__m_270") int __m_270(Buddy var1, Buddy var2) { return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2); } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 439854532e..ae6288a967 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator8(boolean var1) { @@ -19,7 +18,6 @@ public class UserComparator8 extends AbstractUserComparator { signature = "(Lke;Lke;B)I", garbageValue = "0" ) - @Export("__m_266") int __m_266(Buddy var1, Buddy var2) { if(Client.worldId == var1.world0) { if(var2.world0 != Client.worldId) { diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index dc1f5654ff..b44d9086e3 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("m") - @Export("__m") final boolean __m; public UserComparator9(boolean var1) { @@ -20,7 +19,6 @@ public class UserComparator9 extends AbstractUserComparator { signature = "(Lke;Lke;I)I", garbageValue = "1966780392" ) - @Export("__m_264") int __m_264(Buddy var1, Buddy var2) { return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2); } @@ -62,6 +60,7 @@ public class UserComparator9 extends AbstractUserComparator { signature = "(I)[Lln;", garbageValue = "-1724028611" ) + @Export("createSpriteArray") public static Sprite[] createSpriteArray() { Sprite[] var0 = new Sprite[class328.indexedSpriteCount]; diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 30871f2254..bbcdaf3dee 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -72,13 +72,11 @@ public class Username implements Comparable { } } - @Export("__hashCode_467") @ObfuscatedName("hashCode") public int __hashCode_467() { return this.cleanName == null?0:this.cleanName.hashCode(); } - @Export("__toString_468") @ObfuscatedName("toString") public String __toString_468() { return this.getName(); diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 14b5f1d557..4734f53ee8 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -11,7 +11,6 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__iw_m") static AbstractIndexCache __iw_m; @ObfuscatedName("f") @ObfuscatedSignature( @@ -36,7 +35,6 @@ public class VarcInt extends DualNode { signature = "(Lgr;I)V", garbageValue = "1023420886" ) - @Export("__q_411") void __q_411(Buffer var1) { while(true) { int var2 = var1.readUnsignedByte(); @@ -53,7 +51,6 @@ public class VarcInt extends DualNode { signature = "(Lgr;II)V", garbageValue = "-202810982" ) - @Export("__w_412") void __w_412(Buffer var1, int var2) { if(var2 == 2) { this.persist = true; @@ -76,6 +73,7 @@ public class VarcInt extends DualNode { signature = "(CI)Z", garbageValue = "1367119425" ) + @Export("isAlphaNumeric") public static boolean isAlphaNumeric(char var0) { return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index f313cd4d68..1fb5900843 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -11,13 +11,11 @@ public class VarpDefinition extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__ix_m") public static AbstractIndexCache __ix_m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 510774535 ) - @Export("__ix_f") public static int __ix_f; @ObfuscatedName("q") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index bcd9172342..05c9b9616c 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -8,37 +8,31 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("VertexNormal") public class VertexNormal { @ObfuscatedName("pe") - @Export("__dq_pe") static boolean __dq_pe; @ObfuscatedName("rq") @ObfuscatedGetter( intValue = 1351620693 ) - @Export("__dq_rq") static int __dq_rq; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1414310131 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1493845293 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1575149515 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -487323631 ) - @Export("__w") int __w; VertexNormal() { diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 67bde74f63..c1ff7b8b25 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -29,25 +29,21 @@ public class ViewportMouse { @ObfuscatedGetter( intValue = 1135175963 ) - @Export("__dm_u") static int __dm_u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 262104267 ) - @Export("__dm_g") static int __dm_g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -2071972829 ) - @Export("__dm_l") static int __dm_l; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -852671813 ) - @Export("__dm_k") static int __dm_k; @ObfuscatedName("i") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 0fa2775b3e..afda76d29b 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -32,7 +32,6 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__ho_d") public static AbstractIndexCache __ho_d; @ObfuscatedName("n") @ObfuscatedSignature( @@ -56,10 +55,8 @@ public class Widget extends Node { @ObfuscatedSignature( signature = "Ler;" ) - @Export("__ho_z") static EvictingDualNodeHashTable __ho_z; @ObfuscatedName("j") - @Export("__ho_j") public static boolean __ho_j; @ObfuscatedName("s") @Export("isIf3") @@ -170,13 +167,11 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = 206556853 ) - @Export("__aw") public int __aw; @ObfuscatedName("al") @ObfuscatedGetter( intValue = -1047989223 ) - @Export("__al") public int __al; @ObfuscatedName("ab") @ObfuscatedGetter( @@ -254,7 +249,6 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = -1853255291 ) - @Export("__af") public int __af; @ObfuscatedName("ai") @ObfuscatedGetter( @@ -263,7 +257,6 @@ public class Widget extends Node { @Export("lineWid") public int lineWid; @ObfuscatedName("ba") - @Export("__ba") public boolean __ba; @ObfuscatedName("bb") @ObfuscatedGetter( @@ -380,19 +373,16 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = -1692331135 ) - @Export("__bf") public int __bf; @ObfuscatedName("bh") @ObfuscatedGetter( intValue = 727421593 ) - @Export("__bh") public int __bh; @ObfuscatedName("be") @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("bv") - @Export("__bv") public boolean __bv; @ObfuscatedName("bw") @ObfuscatedGetter( @@ -464,19 +454,14 @@ public class Widget extends Node { @Export("clickMask") public int clickMask; @ObfuscatedName("cg") - @Export("__cg") public boolean __cg; @ObfuscatedName("cf") - @Export("__cf") public byte[][] __cf; @ObfuscatedName("cp") - @Export("__cp") public byte[][] __cp; @ObfuscatedName("cc") - @Export("__cc") public int[] __cc; @ObfuscatedName("ci") - @Export("__ci") public int[] __ci; @ObfuscatedName("de") @Export("dataText") @@ -575,34 +560,26 @@ public class Widget extends Node { @Export("onScroll") public Object[] onScroll; @ObfuscatedName("em") - @Export("__em") public Object[] __em; @ObfuscatedName("ed") @Export("onKeyListener") public Object[] onKeyListener; @ObfuscatedName("ex") - @Export("__ex") public Object[] __ex; @ObfuscatedName("ej") - @Export("__ej") public Object[] __ej; @ObfuscatedName("el") - @Export("__el") public Object[] __el; @ObfuscatedName("en") @Export("onDialogAbortListener") public Object[] onDialogAbortListener; @ObfuscatedName("ei") - @Export("__ei") public Object[] __ei; @ObfuscatedName("ee") - @Export("__ee") public Object[] __ee; @ObfuscatedName("eq") - @Export("__eq") public Object[] __eq; @ObfuscatedName("eh") - @Export("__eh") public Object[] __eh; @ObfuscatedName("eo") @Export("cs1Instructions") @@ -662,34 +639,28 @@ public class Widget extends Node { @Export("children") public Widget[] children; @ObfuscatedName("fq") - @Export("__fq") public boolean __fq; @ObfuscatedName("fw") - @Export("__fw") public boolean __fw; @ObfuscatedName("fg") @ObfuscatedGetter( intValue = -1520351537 ) - @Export("__fg") public int __fg; @ObfuscatedName("fc") @ObfuscatedGetter( intValue = 209458049 ) - @Export("__fc") public int __fc; @ObfuscatedName("fl") @ObfuscatedGetter( intValue = -672198209 ) - @Export("__fl") public int __fl; @ObfuscatedName("fj") @ObfuscatedGetter( intValue = 876695207 ) - @Export("__fj") public int __fj; @ObfuscatedName("fp") @ObfuscatedGetter( @@ -704,7 +675,6 @@ public class Widget extends Node { @Export("cycle") public int cycle; @ObfuscatedName("fh") - @Export("__fh") public int[] __fh; @ObfuscatedName("fx") @Export("noClickThrough") @@ -713,7 +683,6 @@ public class Widget extends Node { @Export("noScrollThrough") public boolean noScrollThrough; @ObfuscatedName("fz") - @Export("__fz") public boolean __fz; static { diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java index 0039676529..491c7b8343 100644 --- a/runescape-client/src/main/java/WidgetGroupParent.java +++ b/runescape-client/src/main/java/WidgetGroupParent.java @@ -17,7 +17,6 @@ public class WidgetGroupParent extends Node { @ObfuscatedGetter( intValue = -992379173 ) - @Export("__bx_o") static int __bx_o; @ObfuscatedName("m") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index f34c1ef220..17297fb7e8 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -17,7 +17,6 @@ public class World { @ObfuscatedGetter( intValue = 1143875805 ) - @Export("__bt_g") static int __bt_g; @ObfuscatedName("l") @Export("sortOption2") @@ -84,7 +83,6 @@ public class World { signature = "(B)Z", garbageValue = "0" ) - @Export("__x_145") boolean __x_145() { return (2 & this.properties) != 0; } @@ -104,7 +102,6 @@ public class World { signature = "(I)Z", garbageValue = "-1662622660" ) - @Export("__a_147") boolean __a_147() { return (8 & this.properties) != 0; } diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index 77538cc0e7..1f284bc1a2 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldComparator") final class WorldComparator implements Comparator { @ObfuscatedName("n") - @Export("__u_n") public static boolean __u_n; @ObfuscatedName("m") @@ -16,7 +15,6 @@ final class WorldComparator implements Comparator { signature = "(Ll;Ll;I)I", garbageValue = "707844889" ) - @Export("__m_0") int __m_0(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world?-1:(var2.world == var1.world?0:1); } @@ -27,7 +25,6 @@ final class WorldComparator implements Comparator { return this.__m_0((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @Export("__equals_2") @ObfuscatedName("equals") public boolean __equals_2(Object var1) { return super.equals(var1); diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index abff754e79..13b495ddb3 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -35,19 +35,16 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__g") AbstractIndexCache __g; @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__l") AbstractIndexCache __l; @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__e") AbstractIndexCache __e; @ObfuscatedName("n") @ObfuscatedSignature( @@ -83,7 +80,6 @@ public class WorldMap { @ObfuscatedSignature( signature = "Lag;" ) - @Export("__t") WorldMapArea __t; @ObfuscatedName("y") @ObfuscatedSignature( @@ -155,13 +151,11 @@ public class WorldMap { @ObfuscatedGetter( intValue = -1653084915 ) - @Export("__ac") int __ac; @ObfuscatedName("ay") @ObfuscatedGetter( intValue = 1664740569 ) - @Export("__ay") int __ay; @ObfuscatedName("ah") @Export("perpetualFlash0") @@ -173,58 +167,48 @@ public class WorldMap { @ObfuscatedGetter( intValue = -1683910031 ) - @Export("__aw") int __aw; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 2064651113 ) - @Export("__al") int __al; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -1979665983 ) - @Export("__ab") int __ab; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 547126547 ) - @Export("__ae") int __ae; @ObfuscatedName("at") @ObfuscatedGetter( intValue = -815748997 ) - @Export("__at") int __at; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -988933407 ) - @Export("__ad") int __ad; @ObfuscatedName("ap") @ObfuscatedGetter( longValue = -4747643242047040283L ) - @Export("__ap") long __ap; @ObfuscatedName("as") @ObfuscatedGetter( intValue = -969094439 ) - @Export("__as") int __as; @ObfuscatedName("am") @ObfuscatedGetter( intValue = -869889187 ) - @Export("__am") int __am; @ObfuscatedName("an") - @Export("__an") boolean __an; @ObfuscatedName("ao") @Export("enabledElements") @@ -233,10 +217,8 @@ public class WorldMap { @Export("enabledCategories") HashSet enabledCategories; @ObfuscatedName("ax") - @Export("__ax") HashSet __ax; @ObfuscatedName("af") - @Export("__af") HashSet __af; @ObfuscatedName("ai") @Export("elementsDisabled") @@ -245,19 +227,15 @@ public class WorldMap { @ObfuscatedGetter( intValue = -237734529 ) - @Export("__ba") int __ba; @ObfuscatedName("bs") - @Export("__bs") final int[] __bs; @ObfuscatedName("bq") - @Export("__bq") List __bq; @ObfuscatedName("bn") @Export("iconIterator") Iterator iconIterator; @ObfuscatedName("bk") - @Export("__bk") HashSet __bk; @ObfuscatedName("bd") @ObfuscatedSignature( @@ -278,25 +256,21 @@ public class WorldMap { @ObfuscatedGetter( intValue = 2031417343 ) - @Export("__bx") int __bx; @ObfuscatedName("by") @ObfuscatedGetter( intValue = 754899959 ) - @Export("__by") int __by; @ObfuscatedName("bu") @ObfuscatedGetter( intValue = 2064728623 ) - @Export("__bu") int __bu; @ObfuscatedName("bm") @ObfuscatedGetter( intValue = -1774424249 ) - @Export("__bm") int __bm; static { @@ -378,7 +352,6 @@ public class WorldMap { signature = "(I)V", garbageValue = "-1144390092" ) - @Export("__f_518") public void __f_518() { WorldMapRegion.__av_o.demote(5); } @@ -439,7 +412,6 @@ public class WorldMap { signature = "(IIZZS)V", garbageValue = "18431" ) - @Export("__w_519") public void __w_519(int var1, int var2, boolean var3, boolean var4) { long var5 = class203.currentTimeMs(); this.__o_520(var1, var2, var4, var5); @@ -469,7 +441,6 @@ public class WorldMap { } @ObfuscatedName("o") - @Export("__o_520") void __o_520(int var1, int var2, boolean var3, long var4) { if(this.currentMapArea0 != null) { int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.__ap_537() * this.zoom / 2.0F) / this.zoom); @@ -538,7 +509,6 @@ public class WorldMap { signature = "(I)V", garbageValue = "2075446341" ) - @Export("__g_521") void __g_521() { if(this.__x_524()) { int var1 = this.worldMapTargetX - this.worldMapX; @@ -581,7 +551,6 @@ public class WorldMap { signature = "(B)V", garbageValue = "35" ) - @Export("__e_523") final void __e_523() { this.__ad = -1; this.__at = -1; @@ -594,7 +563,6 @@ public class WorldMap { signature = "(I)Z", garbageValue = "1444745621" ) - @Export("__x_524") boolean __x_524() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } @@ -625,7 +593,6 @@ public class WorldMap { signature = "(IIIZI)V", garbageValue = "469045892" ) - @Export("__a_525") public void __a_525(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if(var5 == null) { @@ -713,7 +680,6 @@ public class WorldMap { signature = "(Lag;Lhu;Lhu;ZI)V", garbageValue = "-1430939646" ) - @Export("__h_526") public void __h_526(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) { if(var1 != null) { if(this.currentMapArea0 == null || var1 != this.currentMapArea0) { @@ -818,7 +784,6 @@ public class WorldMap { signature = "(IIIIIII)Z", garbageValue = "-1561237851" ) - @Export("__p_527") boolean __p_527(int var1, int var2, int var3, int var4, int var5, int var6) { return this.sprite == null?true:(this.sprite.subWidth == var1 && this.sprite.subHeight == var2?(this.worldMapManager.__z != this.__bx?true:(this.__bm != Client.__client_ss?true:(var3 <= 0 && var4 <= 0?var3 + var1 < var5 || var2 + var4 < var6:true))):true); } @@ -828,7 +793,6 @@ public class WorldMap { signature = "(IIIIIII)V", garbageValue = "-2090965249" ) - @Export("__v_528") void __v_528(int var1, int var2, int var3, int var4, int var5, int var6) { if(ClientParameter.field3645 != null) { int var7 = 512 / (this.worldMapManager.__z * 2); @@ -917,7 +881,6 @@ public class WorldMap { signature = "(IB)F", garbageValue = "56" ) - @Export("__av_529") float __av_529(int var1) { return var1 == 25?1.0F:(var1 == 37?1.5F:(var1 == 50?2.0F:(var1 == 75?3.0F:(var1 == 100?4.0F:8.0F)))); } @@ -991,7 +954,6 @@ public class WorldMap { signature = "(III)V", garbageValue = "-2147142500" ) - @Export("__aw_531") public void __aw_531(int var1, int var2) { if(this.currentMapArea0 != null) { this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true); @@ -1005,7 +967,6 @@ public class WorldMap { signature = "(IIIB)V", garbageValue = "-40" ) - @Export("__al_532") public void __al_532(int var1, int var2, int var3) { if(this.currentMapArea0 != null) { int[] var4 = this.currentMapArea0.position(var1, var2, var3); @@ -1021,7 +982,6 @@ public class WorldMap { signature = "(IIII)V", garbageValue = "1808854561" ) - @Export("__ab_533") public void __ab_533(int var1, int var2, int var3) { if(this.currentMapArea0 != null) { int[] var4 = this.currentMapArea0.position(var1, var2, var3); @@ -1037,7 +997,6 @@ public class WorldMap { signature = "(I)I", garbageValue = "-659556919" ) - @Export("__ae_534") public int __ae_534() { return this.currentMapArea0 == null?-1:this.worldMapX + this.currentMapArea0.minX() * 64; } @@ -1047,7 +1006,6 @@ public class WorldMap { signature = "(I)I", garbageValue = "1893257871" ) - @Export("__at_535") public int __at_535() { return this.currentMapArea0 == null?-1:this.worldMapY + this.currentMapArea0.minY() * 64; } @@ -1057,7 +1015,6 @@ public class WorldMap { signature = "(I)Lhu;", garbageValue = "-2005824064" ) - @Export("__ad_536") public TileLocation __ad_536() { return this.currentMapArea0 == null?null:this.currentMapArea0.coord(this.__ae_534(), this.__at_535()); } @@ -1067,7 +1024,6 @@ public class WorldMap { signature = "(I)I", garbageValue = "442119278" ) - @Export("__ap_537") public int __ap_537() { return this.worldMapDisplayWidth; } @@ -1077,7 +1033,6 @@ public class WorldMap { signature = "(I)I", garbageValue = "-2065910749" ) - @Export("__as_538") public int __as_538() { return this.worldMapDisplayHeight; } @@ -1087,7 +1042,6 @@ public class WorldMap { signature = "(II)V", garbageValue = "2017050927" ) - @Export("__am_539") public void __am_539(int var1) { if(var1 >= 1) { this.__ac = var1; @@ -1100,7 +1054,6 @@ public class WorldMap { signature = "(I)V", garbageValue = "-1568631080" ) - @Export("__an_540") public void __an_540() { this.__ac = 3; } @@ -1110,7 +1063,6 @@ public class WorldMap { signature = "(II)V", garbageValue = "107295139" ) - @Export("__az_541") public void __az_541(int var1) { if(var1 >= 1) { this.__ay = var1; @@ -1123,7 +1075,6 @@ public class WorldMap { signature = "(I)V", garbageValue = "2023118274" ) - @Export("__au_542") public void __au_542() { this.__ay = 50; } @@ -1268,7 +1219,6 @@ public class WorldMap { signature = "(I)V", garbageValue = "758731634" ) - @Export("__bk_543") void __bk_543() { this.__af.clear(); this.__af.addAll(this.enabledElements); @@ -1280,7 +1230,6 @@ public class WorldMap { signature = "(IIIIIIB)V", garbageValue = "-73" ) - @Export("__bd_544") public void __bd_544(int var1, int var2, int var3, int var4, int var5, int var6) { if(this.cacheLoader.isLoaded()) { int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); @@ -1316,7 +1265,6 @@ public class WorldMap { signature = "(ILhu;I)Lhu;", garbageValue = "333454230" ) - @Export("__bc_545") public TileLocation __bc_545(int var1, TileLocation var2) { if(!this.cacheLoader.isLoaded()) { return null; diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index afbfcdb8e0..2a3d27d961 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -37,7 +37,6 @@ public class WorldMapArea { @ObfuscatedGetter( intValue = 986239133 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( @@ -306,7 +305,6 @@ public class WorldMapArea { signature = "(I)I", garbageValue = "-1657905623" ) - @Export("__a_39") int __a_39() { return this.__w; } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 7e6c68e5b3..eeacab73f6 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -21,7 +21,6 @@ public class WorldMapAreaData extends WorldMapArea { signature = "(Lgr;Lgr;IZI)V", garbageValue = "-1999841505" ) - @Export("__ce_76") void __ce_76(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); int var5 = var2.__ag_302(); @@ -63,7 +62,6 @@ public class WorldMapAreaData extends WorldMapArea { signature = "(Lgr;ZB)V", garbageValue = "48" ) - @Export("__cy_77") void __cy_77(Buffer var1, boolean var2) { this.__a = new LinkedList(); int var3 = var1.__ag_302(); diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 906ec39875..04d541e9df 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -11,7 +11,6 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__ic_m") public static AbstractIndexCache __ic_m; @ObfuscatedName("w") @ObfuscatedSignature( @@ -29,7 +28,6 @@ public class WorldMapElement extends DualNode { @ObfuscatedGetter( intValue = -1579051565 ) - @Export("__o") public final int __o; @ObfuscatedName("u") @ObfuscatedGetter( @@ -44,13 +42,11 @@ public class WorldMapElement extends DualNode { @Export("sprite2") int sprite2; @ObfuscatedName("l") - @Export("__l") public String __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -231067 ) - @Export("__e") public int __e; @ObfuscatedName("x") @ObfuscatedGetter( @@ -65,31 +61,26 @@ public class WorldMapElement extends DualNode { @Export("string1") public String string1; @ObfuscatedName("i") - @Export("__i") int[] __i; @ObfuscatedName("a") @ObfuscatedGetter( intValue = 1336803515 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1825795359 ) - @Export("__z") int __z; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -1007121521 ) - @Export("__j") int __j; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1209054101 ) - @Export("__s") int __s; @ObfuscatedName("t") @ObfuscatedSignature( @@ -102,10 +93,8 @@ public class WorldMapElement extends DualNode { ) public class249 field3301; @ObfuscatedName("h") - @Export("__h") int[] __h; @ObfuscatedName("b") - @Export("__b") byte[] __b; @ObfuscatedName("c") @ObfuscatedGetter( @@ -245,7 +234,6 @@ public class WorldMapElement extends DualNode { signature = "(I)V", garbageValue = "1799485224" ) - @Export("__w_409") public void __w_409() { if(this.__i != null) { for(int var1 = 0; var1 < this.__i.length; var1 += 2) { @@ -305,7 +293,6 @@ public class WorldMapElement extends DualNode { signature = "(I)I", garbageValue = "821701099" ) - @Export("__g_410") public int __g_410() { return this.__o; } diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java index 4a3450ab53..0e1f232744 100644 --- a/runescape-client/src/main/java/WorldMapIcon1.java +++ b/runescape-client/src/main/java/WorldMapIcon1.java @@ -12,7 +12,6 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedSignature( signature = "Lho;" ) - @Export("__t_i") static Widget __t_i; @ObfuscatedName("db") @ObfuscatedSignature( @@ -33,7 +32,6 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -1722323621 ) - @Export("__m") final int __m; @ObfuscatedName("f") @ObfuscatedSignature( @@ -45,13 +43,11 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = 364253793 ) - @Export("__q") final int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -362031241 ) - @Export("__w") final int __w; @ObfuscatedSignature( @@ -78,7 +74,6 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "1990181988" ) - @Export("__m_15") public int __m_15() { return this.__m; } @@ -88,7 +83,6 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)Laj;", garbageValue = "1159446036" ) - @Export("__f_16") WorldMapLabel __f_16() { return this.label0; } @@ -98,7 +92,6 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "75" ) - @Export("__q_17") int __q_17() { return this.__q; } @@ -108,7 +101,6 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "-1558233611" ) - @Export("__w_18") int __w_18() { return this.__w; } diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index 5a6b13156c..4ed41ff111 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -13,19 +13,16 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -985436813 ) - @Export("__m") final int __m; @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lav;" ) - @Export("__f") final WorldMapRegion __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -25914375 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -37,13 +34,11 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = 927871683 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1431936619 ) - @Export("__u") int __u; @ObfuscatedSignature( @@ -97,7 +92,6 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { signature = "(I)V", garbageValue = "-806344204" ) - @Export("__z_27") void __z_27() { this.__q = class50.getObjectDefinition(this.__m).transform().mapIconId; this.label0 = this.__f.__ab_56(ViewportMouse.getWorldMapElement(this.__q)); diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 01bb187020..2aa8c12cc7 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -21,7 +21,6 @@ public class WorldMapLabel { @ObfuscatedGetter( intValue = -1536028937 ) - @Export("__aj_e") public static int __aj_e; @ObfuscatedName("m") @Export("text") @@ -169,6 +168,7 @@ public class WorldMapLabel { signature = "(I)[Llq;", garbageValue = "-1374541046" ) + @Export("createIndexedSpriteArray") public static IndexedSprite[] createIndexedSpriteArray() { IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount]; diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 43ffdb668a..3730917588 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -35,31 +35,26 @@ public class WorldMapLabelSize { @ObfuscatedSignature( signature = "Lit;" ) - @Export("__s_dq") static IndexCache __s_dq; @ObfuscatedName("fi") @ObfuscatedGetter( intValue = 1577759565 ) - @Export("__s_fi") static int __s_fi; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1252293513 ) - @Export("__w") final int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 707828941 ) - @Export("__o") final int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -422937451 ) - @Export("__u") final int __u; static { @@ -79,7 +74,6 @@ public class WorldMapLabelSize { signature = "(FI)Z", garbageValue = "2107231705" ) - @Export("__f_14") boolean __f_14(float var1) { return var1 >= (float)this.__u; } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index cab85b879f..7388645bbb 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -40,7 +40,6 @@ public final class WorldMapManager { @Export("regions") WorldMapRegion[][] regions; @ObfuscatedName("g") - @Export("__g") HashMap __g; @ObfuscatedName("l") @ObfuscatedSignature( @@ -52,13 +51,11 @@ public final class WorldMapManager { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__e") final AbstractIndexCache __e; @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__x") final AbstractIndexCache __x; @ObfuscatedName("d") @Export("fonts") @@ -79,19 +76,16 @@ public final class WorldMapManager { @ObfuscatedGetter( intValue = 1729323633 ) - @Export("__i") int __i; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -395718741 ) - @Export("__a") int __a; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1085359673 ) - @Export("__z") public int __z; @ObfuscatedSignature( @@ -196,7 +190,6 @@ public final class WorldMapManager { signature = "(IIIIIIIII)V", garbageValue = "1619301748" ) - @Export("__q_72") public final void __q_72(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; int var10 = Rasterizer2D.Rasterizer2D_width; @@ -243,7 +236,6 @@ public final class WorldMapManager { signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", garbageValue = "-71" ) - @Export("__w_73") public final void __w_73(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { class22 var14 = this.method643(var1, var2, var3, var4); float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); @@ -318,7 +310,6 @@ public final class WorldMapManager { signature = "(IIIIIIIIIII)Ljava/util/List;", garbageValue = "1185703832" ) - @Export("__u_74") public List __u_74(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); if(!this.isLoaded0) { @@ -514,6 +505,7 @@ public final class WorldMapManager { signature = "(II)Z", garbageValue = "-1344882321" ) + @Export("isWidgetMenuOpcode") static boolean isWidgetMenuOpcode(int var0) { return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 12258d07ae..9df1dc4a80 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -17,7 +17,6 @@ public class WorldMapRegion { @ObfuscatedSignature( signature = "Lec;" ) - @Export("__av_o") public static DemotingHashTable __av_o; @ObfuscatedName("u") @ObfuscatedGetter( @@ -37,19 +36,16 @@ public class WorldMapRegion { ) class15 field239; @ObfuscatedName("e") - @Export("__e") LinkedList __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -120515153 ) - @Export("__x") int __x; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 415972873 ) - @Export("__d") int __d; @ObfuscatedName("k") @Export("iconsList") @@ -80,7 +76,6 @@ public class WorldMapRegion { signature = "(IIIB)V", garbageValue = "-87" ) - @Export("__w_40") void __w_40(int var1, int var2, int var3) { Sprite var4 = class13.method164(this.x, this.y, this.__d); if(var4 != null) { @@ -109,7 +104,6 @@ public class WorldMapRegion { signature = "(Ljava/util/HashSet;Ljava/util/List;B)V", garbageValue = "-47" ) - @Export("__u_41") void __u_41(HashSet var1, List var2) { this.iconsMap.clear(); Iterator var3 = var1.iterator(); @@ -208,7 +202,6 @@ public class WorldMapRegion { signature = "(B)V", garbageValue = "5" ) - @Export("__e_42") void __e_42() { Iterator var1 = this.iconsMap.values().iterator(); @@ -226,7 +219,6 @@ public class WorldMapRegion { signature = "(Ljava/util/List;I)V", garbageValue = "128876606" ) - @Export("__x_43") void __x_43(List var1) { Iterator var2 = var1.iterator(); @@ -245,7 +237,6 @@ public class WorldMapRegion { signature = "(I)V", garbageValue = "1543354181" ) - @Export("__d_44") void __d_44() { if(this.field239 != null) { this.field239.method282(); @@ -265,7 +256,6 @@ public class WorldMapRegion { signature = "(Lir;B)Z", garbageValue = "2" ) - @Export("__a_45") boolean __a_45(AbstractIndexCache var1) { if(this.field239 != null) { this.field239.method263(var1); @@ -343,7 +333,6 @@ public class WorldMapRegion { signature = "(IIILjava/util/HashSet;I)V", garbageValue = "893970699" ) - @Export("__j_46") void __j_46(int var1, int var2, int var3, HashSet var4) { if(var4 == null) { var4 = new HashSet(); @@ -358,7 +347,6 @@ public class WorldMapRegion { signature = "(Ljava/util/HashSet;IIB)V", garbageValue = "-70" ) - @Export("__s_47") void __s_47(HashSet var1, int var2, int var3) { Iterator var4 = this.iconsMap.values().iterator(); @@ -757,7 +745,6 @@ public class WorldMapRegion { signature = "(IILjava/util/HashSet;IB)V", garbageValue = "0" ) - @Export("__aq_48") void __aq_48(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; float var6 = var5 / 2.0F; @@ -786,7 +773,6 @@ public class WorldMapRegion { signature = "(Ljava/util/HashSet;III)V", garbageValue = "781854370" ) - @Export("__aj_49") void __aj_49(HashSet var1, int var2, int var3) { Iterator var4 = this.iconsList.iterator(); @@ -807,7 +793,6 @@ public class WorldMapRegion { signature = "(Lic;IIIIB)V", garbageValue = "92" ) - @Export("__av_50") void __av_50(WorldMapElement var1, int var2, int var3, int var4, int var5) { Sprite var6 = var1.getSprite(false); if(var6 != null) { @@ -825,7 +810,6 @@ public class WorldMapRegion { signature = "(Lak;IIFI)V", garbageValue = "-1283733783" ) - @Export("__ar_51") void __ar_51(AbstractWorldMapIcon var1, int var2, int var3, float var4) { WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.__m_15()); this.__ac_52(var5, var2, var3); @@ -837,7 +821,6 @@ public class WorldMapRegion { signature = "(Lic;III)V", garbageValue = "423173487" ) - @Export("__ac_52") void __ac_52(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSprite(false); if(var4 != null) { @@ -853,7 +836,6 @@ public class WorldMapRegion { signature = "(Lak;Lic;IIFI)V", garbageValue = "-1237576843" ) - @Export("__ay_53") void __ay_53(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.__f_16(); if(var6 != null) { @@ -869,7 +851,6 @@ public class WorldMapRegion { signature = "(IILjava/util/HashSet;IB)V", garbageValue = "-17" ) - @Export("__ah_54") void __ah_54(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; Iterator var6 = this.iconsList.iterator(); @@ -926,7 +907,6 @@ public class WorldMapRegion { signature = "(II)Laj;", garbageValue = "598030754" ) - @Export("__al_55") WorldMapLabel __al_55(int var1) { WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1); return this.__ab_56(var2); @@ -937,7 +917,6 @@ public class WorldMapRegion { signature = "(Lic;B)Laj;", garbageValue = "59" ) - @Export("__ab_56") WorldMapLabel __ab_56(WorldMapElement var1) { if(var1.__l != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { WorldMapLabelSize var2 = WorldMapLabelSize.method195(var1.textSize); @@ -976,7 +955,6 @@ public class WorldMapRegion { signature = "(IIIIII)Ljava/util/List;", garbageValue = "-1237576843" ) - @Export("__ae_57") List __ae_57(int var1, int var2, int var3, int var4, int var5) { LinkedList var6 = new LinkedList(); if(var4 >= var1 && var5 >= var2) { @@ -1027,7 +1005,6 @@ public class WorldMapRegion { signature = "(IIIII)V", garbageValue = "-1516512827" ) - @Export("__ad_58") void __ad_58(int var1, int var2, int var3, int var4) { var3 %= 4; if(var3 == 0) { diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index f9066d33be..6f10a54e08 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -11,82 +11,68 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedGetter( intValue = -1946112139 ) - @Export("__y_sn") static int __y_sn; @ObfuscatedName("p") - @Export("__y_p") static int[] __y_p; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -2011838881 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1299225715 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 82600709 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -477370575 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -671345527 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 529427495 ) - @Export("__u") int __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -150870205 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 1009718107 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1022177315 ) - @Export("__e") int __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1397517463 ) - @Export("__x") int __x; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -799353317 ) - @Export("__d") int __d; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1388959491 ) - @Export("__k") int __k; @ObfuscatedName("n") @ObfuscatedGetter( @@ -97,7 +83,6 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedGetter( intValue = 1345061881 ) - @Export("__i") int __i; @ObfuscatedName("m") @@ -105,6 +90,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(Lag;I)V", garbageValue = "1384899025" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if(var1.minX0 > this.__o) { var1.minX0 = this.__o; @@ -129,6 +115,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(IIIB)Z", garbageValue = "93" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__e << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__x << 3) + 7:false; } @@ -138,6 +125,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(IIB)Z", garbageValue = "4" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.__o << 6) + (this.__d << 3) && var1 <= (this.__o << 6) + (this.__n << 3) + 7 && var2 >= (this.__u << 6) + (this.__k << 3) && var2 <= (this.__u << 6) + (this.__i << 3) + 7; } @@ -147,6 +135,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(IIII)[I", garbageValue = "1545934424" ) + @Export("position") public int[] position(int var1, int var2, int var3) { if(!this.containsCoord(var1, var2, var3)) { return null; @@ -161,6 +150,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(III)Lhu;", garbageValue = "-1916486802" ) + @Export("coord") public TileLocation coord(int var1, int var2) { if(!this.containsPosition(var1, var2)) { return null; @@ -176,6 +166,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(Lgr;B)V", garbageValue = "-113" ) + @Export("read") public void read(Buffer var1) { this.__m = var1.readUnsignedByte(); this.__f = var1.readUnsignedByte(); @@ -199,7 +190,6 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(I)V", garbageValue = "1967186894" ) - @Export("__g_25") void __g_25() { } @@ -208,6 +198,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(I)V", garbageValue = "-2102591569" ) + @Export("savePreferences") static void savePreferences() { AccessFile var0 = null; diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 5e531807a7..8661c099e2 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -20,7 +20,6 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedGetter( intValue = -1516124929 ) - @Export("__as_ey") static int __as_ey; @ObfuscatedName("ha") @ObfuscatedGetter( @@ -32,61 +31,51 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedGetter( intValue = -1971304641 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1483447179 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1875803617 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 284566685 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1513010233 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1383826035 ) - @Export("__u") int __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1526007343 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -890169045 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1797724181 ) - @Export("__e") int __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 325777555 ) - @Export("__x") int __x; @ObfuscatedName("m") @@ -94,6 +83,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(Lag;I)V", garbageValue = "1384899025" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if(var1.minX0 > this.__o) { var1.minX0 = this.__o; @@ -118,6 +108,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(IIIB)Z", garbageValue = "93" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__g << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__l << 3) + 7:false; } @@ -127,6 +118,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(IIB)Z", garbageValue = "4" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.__o << 6) + (this.__e << 3) && var1 <= (this.__o << 6) + (this.__e << 3) + 7 && var2 >= (this.__u << 6) + (this.__x << 3) && var2 <= (this.__u << 6) + (this.__x << 3) + 7; } @@ -136,6 +128,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(IIII)[I", garbageValue = "1545934424" ) + @Export("position") public int[] position(int var1, int var2, int var3) { if(!this.containsCoord(var1, var2, var3)) { return null; @@ -150,6 +143,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(III)Lhu;", garbageValue = "-1916486802" ) + @Export("coord") public TileLocation coord(int var1, int var2) { if(!this.containsPosition(var1, var2)) { return null; @@ -165,6 +159,7 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(Lgr;B)V", garbageValue = "-113" ) + @Export("read") public void read(Buffer var1) { this.__m = var1.readUnsignedByte(); this.__f = var1.readUnsignedByte(); @@ -184,7 +179,6 @@ public class WorldMapSection1 implements WorldMapSection { signature = "(I)V", garbageValue = "2026323437" ) - @Export("__g_84") void __g_84() { } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 63347180aa..ce26f97738 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -8,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { @ObfuscatedName("l") - @Export("__ah_l") static int[] __ah_l; @ObfuscatedName("j") @Export("cacheDirectoryLocations") @@ -17,37 +16,31 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedGetter( intValue = -1561552223 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -245382089 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1024859679 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 40495485 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 982234927 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1272330125 ) - @Export("__u") int __u; @ObfuscatedName("m") @@ -55,6 +48,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(Lag;I)V", garbageValue = "1384899025" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if(var1.minX0 > this.__o) { var1.minX0 = this.__o; @@ -79,6 +73,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(IIIB)Z", garbageValue = "93" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 == this.__q && var3 >> 6 == this.__w:false; } @@ -88,6 +83,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(IIB)Z", garbageValue = "4" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.__o && var2 >> 6 == this.__u; } @@ -97,6 +93,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(IIII)[I", garbageValue = "1545934424" ) + @Export("position") public int[] position(int var1, int var2, int var3) { if(!this.containsCoord(var1, var2, var3)) { return null; @@ -111,6 +108,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(III)Lhu;", garbageValue = "-1916486802" ) + @Export("coord") public TileLocation coord(int var1, int var2) { if(!this.containsPosition(var1, var2)) { return null; @@ -126,6 +124,7 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(Lgr;B)V", garbageValue = "-113" ) + @Export("read") public void read(Buffer var1) { this.__m = var1.readUnsignedByte(); this.__f = var1.readUnsignedByte(); @@ -141,7 +140,6 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(I)V", garbageValue = "-1602858772" ) - @Export("__g_65") void __g_65() { } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 41bd777ed2..77c5862ad7 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -20,67 +20,56 @@ public class WorldMapSection3 implements WorldMapSection { @ObfuscatedGetter( intValue = -948290091 ) - @Export("__p_go") static int __p_go; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1389733201 ) - @Export("__m") int __m; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -1622972483 ) - @Export("__f") int __f; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 702057599 ) - @Export("__q") int __q; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1068088609 ) - @Export("__w") int __w; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1257151629 ) - @Export("__o") int __o; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -1351623663 ) - @Export("__u") int __u; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1016557381 ) - @Export("__g") int __g; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 884736611 ) - @Export("__l") int __l; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 395786901 ) - @Export("__e") int __e; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -627081155 ) - @Export("__x") int __x; @ObfuscatedName("m") @@ -88,6 +77,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(Lag;I)V", garbageValue = "1384899025" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if(var1.minX0 > this.__g) { var1.minX0 = this.__g; @@ -112,6 +102,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(IIIB)Z", garbageValue = "93" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 >= this.__q && var2 >> 6 <= this.__o && var3 >> 6 >= this.__w && var3 >> 6 <= this.__u:false; } @@ -121,6 +112,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(IIB)Z", garbageValue = "4" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 >= this.__g && var1 >> 6 <= this.__e && var2 >> 6 >= this.__l && var2 >> 6 <= this.__x; } @@ -130,6 +122,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(IIII)[I", garbageValue = "1545934424" ) + @Export("position") public int[] position(int var1, int var2, int var3) { if(!this.containsCoord(var1, var2, var3)) { return null; @@ -144,6 +137,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(III)Lhu;", garbageValue = "-1916486802" ) + @Export("coord") public TileLocation coord(int var1, int var2) { if(!this.containsPosition(var1, var2)) { return null; @@ -159,6 +153,7 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(Lgr;B)V", garbageValue = "-113" ) + @Export("read") public void read(Buffer var1) { this.__m = var1.readUnsignedByte(); this.__f = var1.readUnsignedByte(); @@ -178,7 +173,6 @@ public class WorldMapSection3 implements WorldMapSection { signature = "(B)V", garbageValue = "-126" ) - @Export("__g_38") void __g_38() { } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 1a2ecc9c35..25bac17559 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -12,25 +12,21 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedSignature( signature = "Lh;" ) - @Export("__h_m") __h_m(1, (byte)0), @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lh;" ) - @Export("__h_f") __h_f(0, (byte)1), @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lh;" ) - @Export("__h_q") __h_q(3, (byte)2), @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lh;" ) - @Export("__h_w") __h_w(2, (byte)3); @ObfuscatedName("e") @ObfuscatedSignature( @@ -39,7 +35,6 @@ public enum WorldMapSectionType implements Enumerated { @Export("logoSprite") static IndexedSprite logoSprite; @ObfuscatedName("n") - @Export("__h_n") static int[] __h_n; @ObfuscatedName("gc") @ObfuscatedSignature( @@ -67,6 +62,7 @@ public enum WorldMapSectionType implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 9a5afd50a3..7e78c1a9c0 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -8,7 +8,6 @@ final class class1 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__f_m") public static AbstractIndexCache __f_m; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java index 0d10655c77..5099b3aa94 100644 --- a/runescape-client/src/main/java/class102.java +++ b/runescape-client/src/main/java/class102.java @@ -4,19 +4,14 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("ca") public class class102 { @ObfuscatedName("m") - @Export("__ca_m") static final int[] __ca_m; @ObfuscatedName("f") - @Export("__ca_f") static final float[] __ca_f; @ObfuscatedName("x") - @Export("__ca_x") static int[] __ca_x; @ObfuscatedName("d") - @Export("__ca_d") static int[] __ca_d; @ObfuscatedName("k") - @Export("__ca_k") static boolean[] __ca_k; @ObfuscatedName("q") int[] field1353; diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 7447f2a24c..f3808368eb 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -9,7 +9,6 @@ final class class12 implements Comparator { @ObfuscatedSignature( signature = "Lho;" ) - @Export("__n_n") static Widget __n_n; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 4b67531628..bd6ef3a987 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -6,7 +6,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("i") public class class13 { @ObfuscatedName("x") - @Export("__i_x") static int[] __i_x; @ObfuscatedName("k") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 5bb42bfc02..0bcb48c166 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -9,7 +9,6 @@ public class class15 extends class21 { @ObfuscatedGetter( longValue = 3423502126894795079L ) - @Export("__z_si") static long __z_si; @ObfuscatedName("j") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java index c4948607bb..4f2d436c49 100644 --- a/runescape-client/src/main/java/class157.java +++ b/runescape-client/src/main/java/class157.java @@ -9,7 +9,6 @@ public class class157 extends AbstractUserComparator { @ObfuscatedGetter( intValue = 1006519291 ) - @Export("__fw_nm") static int __fw_nm; @ObfuscatedName("m") final boolean field1969; diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java index 8018fc0c88..f38ef0ffc0 100644 --- a/runescape-client/src/main/java/class159.java +++ b/runescape-client/src/main/java/class159.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -46,6 +47,7 @@ public enum class159 implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field1981; } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 4f53e455a0..ad03754107 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -14,6 +14,7 @@ public class class16 { @ObfuscatedSignature( signature = "Lbp;" ) + @Export("loginScreenRunesAnimation") static LoginScreenAnimation loginScreenRunesAnimation; @ObfuscatedName("dv") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java index a5fe73d5bc..4b534460d2 100644 --- a/runescape-client/src/main/java/class168.java +++ b/runescape-client/src/main/java/class168.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fs") public class class168 { @ObfuscatedName("o") - @Export("__fs_o") public static File __fs_o; @ObfuscatedName("u") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index fb214f2738..4260d72875 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -11,16 +11,12 @@ public class class171 { @ObfuscatedGetter( intValue = -852697585 ) - @Export("__fo_ro") static int __fo_ro; @ObfuscatedName("m") - @Export("__fo_m") public static boolean __fo_m; @ObfuscatedName("f") - @Export("__fo_f") public static File __fo_f; @ObfuscatedName("q") - @Export("__fo_q") static Hashtable __fo_q; static { diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index f648d1f2b2..191a9e79af 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -5,16 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gx") public class class204 { @ObfuscatedName("x") - @Export("__gx_x") static final int[] __gx_x; @ObfuscatedName("d") - @Export("__gx_d") static final int[] __gx_d; @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lkk;" ) - @Export("__gx_n") public static Font __gx_n; static { diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java index 259d966766..6aa5d7d036 100644 --- a/runescape-client/src/main/java/class21.java +++ b/runescape-client/src/main/java/class21.java @@ -7,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("b") public abstract class class21 { @ObfuscatedName("by") - @Export("__b_by") static String __b_by; @ObfuscatedName("m") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index 8840cdf5b5..73bb469301 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -8,13 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hg") public class class211 { @ObfuscatedName("m") - @Export("__hg_m") static final String[][] __hg_m; @ObfuscatedName("f") - @Export("__hg_f") static final String[] __hg_f; @ObfuscatedName("q") - @Export("__hg_q") static Calendar __hg_q; @ObfuscatedName("em") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java index fb35600fda..c5924e20a2 100644 --- a/runescape-client/src/main/java/class214.java +++ b/runescape-client/src/main/java/class214.java @@ -9,13 +9,11 @@ public class class214 { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__hf_f") public static AbstractIndexCache __hf_f; @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__hf_q") public static AbstractIndexCache __hf_q; @ObfuscatedName("w") @ObfuscatedSignature( @@ -27,16 +25,13 @@ public class class214 { @ObfuscatedGetter( intValue = -848833001 ) - @Export("__hf_o") public static int __hf_o; @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lir;" ) - @Export("__hf_u") public static AbstractIndexCache __hf_u; @ObfuscatedName("k") - @Export("__hf_k") static int[] __hf_k; @ObfuscatedName("ko") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index c4c22c4f78..6ae0e4e5b4 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -5,16 +5,12 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ht") public class class226 { @ObfuscatedName("m") - @Export("__ht_m") public static final short[] __ht_m; @ObfuscatedName("f") - @Export("__ht_f") public static final short[][] __ht_f; @ObfuscatedName("q") - @Export("__ht_q") public static final short[] __ht_q; @ObfuscatedName("w") - @Export("__ht_w") public static final short[][] __ht_w; static { diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 9b08e368b6..55b596870c 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -5,7 +5,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hj") public class class227 { @ObfuscatedName("e") - @Export("__hj_e") public static short[] __hj_e; @ObfuscatedName("l") diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index a3db606284..3ee3edf4e1 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -5,7 +5,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hz") public class class229 { @ObfuscatedName("l") - @Export("__hz_l") public static short[][] __hz_l; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java index 45abced5f0..320164629a 100644 --- a/runescape-client/src/main/java/class230.java +++ b/runescape-client/src/main/java/class230.java @@ -5,7 +5,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hy") public class class230 { @ObfuscatedName("az") - @Export("__hy_az") protected static boolean __hy_az; @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index edbdbf067b..f74b286451 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -125,10 +125,8 @@ public enum class231 implements Enumerated { @ObfuscatedGetter( intValue = -745071109 ) - @Export("__hb_sg") static int __hb_sg; @ObfuscatedName("av") - @Export("__hb_av") static java.awt.Font __hb_av; @ObfuscatedName("r") @ObfuscatedGetter( @@ -149,6 +147,7 @@ public enum class231 implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field2820; } diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java index 4e6b7a3c66..7d529fbf77 100644 --- a/runescape-client/src/main/java/class248.java +++ b/runescape-client/src/main/java/class248.java @@ -7,13 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("iu") public class class248 { @ObfuscatedName("e") - @Export("__iu_e") static int[] __iu_e; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 662119345 ) - @Export("__iu_n") static int __iu_n; @ObfuscatedName("m") final HashMap field3267; diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java index e6ba48a937..05f3efda01 100644 --- a/runescape-client/src/main/java/class249.java +++ b/runescape-client/src/main/java/class249.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -41,6 +42,7 @@ public enum class249 implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field3276; } diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java index 7881dd6794..72071e4fc6 100644 --- a/runescape-client/src/main/java/class266.java +++ b/runescape-client/src/main/java/class266.java @@ -45,6 +45,7 @@ public enum class266 implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field3530; } diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index b752bea56b..56f35f4e9d 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -13,7 +13,6 @@ public final class class27 { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__aq_k") public static AbstractIndexCache __aq_k; @ObfuscatedName("f") final int[] field225; @@ -49,6 +48,7 @@ public final class class27 { signature = "([BI)Lln;", garbageValue = "-143338910" ) + @Export("convertJpgToSprite") public static final Sprite convertJpgToSprite(byte[] var0) { BufferedImage var1 = null; diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index 2a92e19d7a..4842816eaa 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -8,7 +8,6 @@ public class class277 { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__jn_by") static IndexedSprite __jn_by; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index 2f80b4c89c..d04cc4cf14 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -8,7 +8,6 @@ public class class279 { @ObfuscatedSignature( signature = "[Lho;" ) - @Export("__jx_ne") static Widget[] __jx_ne; @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 65dabeb01f..897fa6c136 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -9,7 +9,6 @@ public class class3 implements Enumerated { @ObfuscatedGetter( intValue = 1608439891 ) - @Export("__w_qs") static int __w_qs; @ObfuscatedName("m") @ObfuscatedSignature( @@ -65,6 +64,7 @@ public class class3 implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 04ce1a6141..77772fbde5 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -9,7 +9,6 @@ public class class30 { @ObfuscatedGetter( intValue = -1555836449 ) - @Export("__ar_qw") static int __ar_qw; @ObfuscatedName("m") @ObfuscatedSignature( @@ -65,6 +64,7 @@ public class class30 { signature = "(B)V", garbageValue = "49" ) + @Export("resetMenuEntries") static void resetMenuEntries() { Client.menuOptionsCount = 0; Client.isMenuOpen = false; diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java index b28a55c0b0..c3c1e965b5 100644 --- a/runescape-client/src/main/java/class305.java +++ b/runescape-client/src/main/java/class305.java @@ -4,10 +4,8 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("kb") public class class305 { @ObfuscatedName("q") - @Export("__kb_q") static final char[] __kb_q; @ObfuscatedName("w") - @Export("__kb_w") static final char[] __kb_w; static { diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index 060ec01941..dd819cd054 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -5,19 +5,14 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kc") public class class307 { @ObfuscatedName("m") - @Export("__kc_m") public static char[] __kc_m; @ObfuscatedName("f") - @Export("__kc_f") static char[] __kc_f; @ObfuscatedName("q") - @Export("__kc_q") static char[] __kc_q; @ObfuscatedName("w") - @Export("__kc_w") static int[] __kc_w; @ObfuscatedName("g") - @Export("__kc_g") static byte[][][] __kc_g; @ObfuscatedName("n") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java index da433a2eab..e5f27d2836 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/class311.java @@ -14,7 +14,6 @@ public class class311 { @ObfuscatedGetter( intValue = -2077113503 ) - @Export("__ka_e") static int __ka_e; @ObfuscatedName("f") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java index 5dd381a8f5..1b7fea7a37 100644 --- a/runescape-client/src/main/java/class313.java +++ b/runescape-client/src/main/java/class313.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -71,6 +72,7 @@ public enum class313 implements Enumerated { signature = "(B)I", garbageValue = "83" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field3827; } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index a5b80e69af..95bd7cf314 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -5,7 +5,6 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ay") public class class32 { @ObfuscatedName("u") - @Export("__ay_u") static byte[][][] __ay_u; @ObfuscatedName("gj") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 325b6bbf36..bdc7d67388 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -8,7 +8,6 @@ final class class4 implements class0 { @ObfuscatedSignature( signature = "Lir;" ) - @Export("__o_m") public static AbstractIndexCache __o_m; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java index 41a84cb467..b88da2916a 100644 --- a/runescape-client/src/main/java/class50.java +++ b/runescape-client/src/main/java/class50.java @@ -7,10 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("af") public class class50 { @ObfuscatedName("m") - @Export("__af_m") public static Applet __af_m; @ObfuscatedName("f") - @Export("__af_f") public static String __af_f; @ObfuscatedName("ei") @Export("worldHost") diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 7f70234cea..75a8e68f79 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -9,7 +9,6 @@ public final class class54 { @ObfuscatedGetter( intValue = -1247107945 ) - @Export("__bs_nb") static int __bs_nb; @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index f35817664d..9eeaa4ca44 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -12,7 +12,6 @@ public class class60 { @Export("worldMap0") static WorldMap worldMap0; @ObfuscatedName("ar") - @Export("__bo_ar") static FontMetrics __bo_ar; @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index 49d74e779f..3c671e174b 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -6,10 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ce") public class class80 { @ObfuscatedName("o") - @Export("__ce_o") static final BigInteger __ce_o; @ObfuscatedName("u") - @Export("__ce_u") static final BigInteger __ce_u; static { diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index c112879d60..e9198a0915 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -9,16 +9,13 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cm") public class class83 { @ObfuscatedName("m") - @Export("__cm_m") static final BigInteger __cm_m; @ObfuscatedName("f") - @Export("__cm_f") static final BigInteger __cm_f; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 533653621 ) - @Export("__cm_e") public static int __cm_e; static {