diff --git a/build.gradle.kts b/build.gradle.kts index 8cfc76f486..89b10a426a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ buildscript { dependencies { classpath("org.ajoberstar.grgit:grgit-core:4.1.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.33.0") - classpath("com.openosrs:injector-plugin:1.1.5") + classpath("com.openosrs:injector-plugin:1.1.6") } } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index a54c3c81ad..1a66af8824 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public abstract class AbstractArchive { @ObfuscatedSignature( descriptor = "Lma;" ) - @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; @ObfuscatedName("y") @ObfuscatedGetter( @@ -22,58 +20,43 @@ public abstract class AbstractArchive { @ObfuscatedGetter( intValue = -1207757515 ) - @Export("groupCount") int groupCount; @ObfuscatedName("s") - @Export("groupIds") int[] groupIds; @ObfuscatedName("t") - @Export("groupNameHashes") int[] groupNameHashes; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lmc;" ) - @Export("groupNameHashTable") IntHashTable groupNameHashTable; @ObfuscatedName("o") - @Export("groupCrcs") int[] groupCrcs; @ObfuscatedName("x") - @Export("groupVersions") int[] groupVersions; @ObfuscatedName("w") - @Export("fileCounts") int[] fileCounts; @ObfuscatedName("g") - @Export("fileIds") int[][] fileIds; @ObfuscatedName("m") - @Export("fileNameHashes") int[][] fileNameHashes; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "[Lmc;" ) - @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; @ObfuscatedName("d") - @Export("groups") Object[] groups; @ObfuscatedName("h") - @Export("files") Object[][] files; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1382012253 ) - @Export("hash") public int hash; @ObfuscatedName("c") - @Export("releaseGroups") boolean releaseGroups; @ObfuscatedName("f") - @Export("shallowFiles") boolean shallowFiles; static { @@ -91,7 +74,6 @@ public abstract class AbstractArchive { descriptor = "([BI)V", garbageValue = "1234348933" ) - @Export("decodeIndex") void decodeIndex(byte[] var1) { this.hash = GameShell.method1108(var1, var1.length); // L: 37 Buffer var2 = new Buffer(DevicePcmPlayerProvider.decompressBytes(var1)); // L: 38 @@ -224,7 +206,6 @@ public abstract class AbstractArchive { descriptor = "(II)V", garbageValue = "176946518" ) - @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } // L: 118 @@ -233,7 +214,6 @@ public abstract class AbstractArchive { descriptor = "(III)[B", garbageValue = "273690094" ) - @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121 } @@ -243,7 +223,6 @@ public abstract class AbstractArchive { descriptor = "(II[II)[B", garbageValue = "1965350454" ) - @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125 if (this.files[var1][var2] == null) { // L: 126 @@ -273,7 +252,6 @@ public abstract class AbstractArchive { descriptor = "(IIB)Z", garbageValue = "49" ) - @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140 if (this.files[var1][var2] != null) { // L: 141 @@ -309,7 +287,6 @@ public abstract class AbstractArchive { descriptor = "(II)Z", garbageValue = "2078810359" ) - @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { if (this.groups[var1] != null) { // L: 155 return true; @@ -324,7 +301,6 @@ public abstract class AbstractArchive { descriptor = "(I)Z", garbageValue = "-719435847" ) - @Export("isFullyLoaded") public boolean isFullyLoaded() { boolean var1 = true; // L: 162 @@ -346,7 +322,6 @@ public abstract class AbstractArchive { descriptor = "(II)I", garbageValue = "-21407020" ) - @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; // L: 174 175 } @@ -356,7 +331,6 @@ public abstract class AbstractArchive { descriptor = "(II)[B", garbageValue = "-1800797786" ) - @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { if (this.files.length == 1) { // L: 179 return this.takeFile(0, var1); @@ -372,7 +346,6 @@ public abstract class AbstractArchive { descriptor = "(III)[B", garbageValue = "-1118526903" ) - @Export("getFile") public byte[] getFile(int var1, int var2) { if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185 if (this.files[var1][var2] == null) { // L: 186 @@ -398,7 +371,6 @@ public abstract class AbstractArchive { descriptor = "(IB)[B", garbageValue = "89" ) - @Export("getFileFlat") public byte[] getFileFlat(int var1) { if (this.files.length == 1) { // L: 199 return this.getFile(0, var1); @@ -414,7 +386,6 @@ public abstract class AbstractArchive { descriptor = "(II)V", garbageValue = "450530880" ) - @Export("loadGroup") void loadGroup(int var1) { } // L: 204 @@ -423,7 +394,6 @@ public abstract class AbstractArchive { descriptor = "(IB)[I", garbageValue = "-40" ) - @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 } @@ -433,7 +403,6 @@ public abstract class AbstractArchive { descriptor = "(II)I", garbageValue = "-1433553741" ) - @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; // L: 214 } @@ -443,7 +412,6 @@ public abstract class AbstractArchive { descriptor = "(I)I", garbageValue = "-2124979087" ) - @Export("getGroupCount") public int getGroupCount() { return this.files.length; // L: 218 } @@ -453,7 +421,6 @@ public abstract class AbstractArchive { descriptor = "(I)V", garbageValue = "1681224039" ) - @Export("clearGroups") public void clearGroups() { for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 this.groups[var1] = null; @@ -466,7 +433,6 @@ public abstract class AbstractArchive { descriptor = "(II)V", garbageValue = "1439856856" ) - @Export("clearFilesGroup") public void clearFilesGroup(int var1) { for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 this.files[var1][var2] = null; @@ -479,7 +445,6 @@ public abstract class AbstractArchive { descriptor = "(B)V", garbageValue = "-83" ) - @Export("clearFiles") public void clearFiles() { for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230 if (this.files[var1] != null) { // L: 231 @@ -496,7 +461,6 @@ public abstract class AbstractArchive { descriptor = "(I[II)Z", garbageValue = "303004992" ) - @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { if (this.groups[var1] == null) { // L: 238 return false; @@ -594,7 +558,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;I)I", garbageValue = "-1161611566" ) - @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); // L: 308 return this.groupNameHashTable.get(Timer.hashString(var1)); // L: 309 @@ -605,7 +568,6 @@ public abstract class AbstractArchive { descriptor = "(ILjava/lang/String;B)I", garbageValue = "-117" ) - @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); // L: 313 return this.fileNameHashTables[var1].get(Timer.hashString(var2)); // L: 314 @@ -616,7 +578,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", garbageValue = "-1221134152" ) - @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); // L: 318 var2 = var2.toLowerCase(); // L: 319 @@ -634,7 +595,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", garbageValue = "-406743682" ) - @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); // L: 328 var2 = var2.toLowerCase(); // L: 329 @@ -648,7 +608,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", garbageValue = "63" ) - @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); // L: 336 var2 = var2.toLowerCase(); // L: 337 @@ -662,7 +621,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;I)Z", garbageValue = "1277602080" ) - @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); // L: 344 int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 345 @@ -674,7 +632,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;I)V", garbageValue = "663022777" ) - @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); // L: 350 int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 351 @@ -688,7 +645,6 @@ public abstract class AbstractArchive { descriptor = "(Ljava/lang/String;I)I", garbageValue = "-1179908278" ) - @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); // L: 357 int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 358 diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 439550ca90..a5d79f24bf 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public abstract class AbstractByteArrayCopier { @ObfuscatedSignature( descriptor = "[Lct;" ) - @Export("World_worlds") static World[] World_worlds; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("logoSprite") static IndexedSprite logoSprite; AbstractByteArrayCopier() { @@ -27,7 +24,6 @@ public abstract class AbstractByteArrayCopier { descriptor = "(I)[B", garbageValue = "-1021172953" ) - @Export("get") abstract byte[] get(); @ObfuscatedName("t") @@ -35,7 +31,6 @@ public abstract class AbstractByteArrayCopier { descriptor = "([BI)V", garbageValue = "-1366071744" ) - @Export("set") abstract void set(byte[] var1); @ObfuscatedName("ig") @@ -65,7 +60,6 @@ public abstract class AbstractByteArrayCopier { descriptor = "(I)V", garbageValue = "-1068531314" ) - @Export("Clan_leaveChat") static final void Clan_leaveChat() { PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 10705 var0.packetBuffer.writeByte(0); // L: 10706 diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index e258db3ef3..f6ba71620e 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -1,5 +1,4 @@ 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,70 +10,48 @@ public abstract class AbstractFont extends Rasterizer2D { @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; @ObfuscatedName("d") - @Export("AbstractFont_strike") static int AbstractFont_strike; @ObfuscatedName("h") - @Export("AbstractFont_underline") static int AbstractFont_underline; @ObfuscatedName("a") - @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; @ObfuscatedName("q") - @Export("AbstractFont_shadow") static int AbstractFont_shadow; @ObfuscatedName("c") - @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; @ObfuscatedName("f") - @Export("AbstractFont_color") static int AbstractFont_color; @ObfuscatedName("y") - @Export("AbstractFont_alpha") static int AbstractFont_alpha; @ObfuscatedName("v") - @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; @ObfuscatedName("j") - @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; @ObfuscatedName("r") - @Export("AbstractFont_random") static Random AbstractFont_random; @ObfuscatedName("u") - @Export("AbstractFont_lines") static String[] AbstractFont_lines; @ObfuscatedName("z") - @Export("pixels") byte[][] pixels; @ObfuscatedName("k") - @Export("advances") int[] advances; @ObfuscatedName("s") - @Export("widths") int[] widths; @ObfuscatedName("t") - @Export("heights") int[] heights; @ObfuscatedName("i") - @Export("leftBearings") int[] leftBearings; @ObfuscatedName("o") - @Export("topBearings") int[] topBearings; @ObfuscatedName("x") - @Export("ascent") public int ascent; @ObfuscatedName("w") - @Export("maxAscent") public int maxAscent; @ObfuscatedName("g") - @Export("maxDescent") public int maxDescent; @ObfuscatedName("n") - @Export("kerning") byte[] kerning; static { @@ -124,15 +101,12 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 54 @ObfuscatedName("z") - @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); @ObfuscatedName("k") - @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); @ObfuscatedName("g") - @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 57 int var2; @@ -205,7 +179,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 97 @ObfuscatedName("n") - @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 122 var1 = ' '; @@ -215,7 +188,6 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("d") - @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 127 return 0; @@ -271,7 +243,6 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("h") - @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 164 return 0; @@ -376,7 +347,6 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("a") - @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 int var4 = 0; // L: 249 @@ -392,13 +362,11 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("q") - @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 } @ObfuscatedName("j") - @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 279 this.reset(var4, var5); // L: 280 @@ -407,7 +375,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 282 @ObfuscatedName("r") - @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 285 this.reset(var4, var5); // L: 286 @@ -417,7 +384,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 289 @ObfuscatedName("u") - @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 this.reset(var4, var5); // L: 293 @@ -426,7 +392,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 295 @ObfuscatedName("p") - @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 298 this.reset(var4, var5); // L: 299 @@ -435,7 +400,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 301 @ObfuscatedName("b") - @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { // L: 304 return 0; @@ -496,7 +460,6 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("l") - @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 339 this.reset(var4, var5); // L: 340 @@ -511,7 +474,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 344 @ObfuscatedName("e") - @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 347 this.reset(var4, var5); // L: 348 @@ -528,7 +490,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 356 @ObfuscatedName("ab") - @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 359 this.reset(var4, var5); // L: 360 @@ -548,7 +509,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 366 @ObfuscatedName("ag") - @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 369 this.reset(var4, var5); // L: 370 @@ -569,7 +529,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 380 @ObfuscatedName("ao") - @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 383 AbstractFont_underline = -1; // L: 384 @@ -583,7 +542,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 390 @ObfuscatedName("ae") - @Export("decodeTag") void decodeTag(String var1) { try { if (var1.startsWith("col=")) { // L: 394 @@ -617,7 +575,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 408 @ObfuscatedName("ap") - @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; // L: 411 boolean var4 = false; // L: 412 @@ -640,7 +597,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 420 @ObfuscatedName("au") - @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; // L: 423 int var4 = -1; // L: 424 @@ -729,7 +685,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 483 @ObfuscatedName("aa") - @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; // L: 486 int var6 = -1; // L: 487 @@ -883,7 +838,6 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("c") - @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 262 int var2 = 0; // L: 263 @@ -912,7 +866,6 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("ar") - @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 567 int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568 @@ -954,7 +907,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 596 @ObfuscatedName("at") - @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 599 var5 = -(var5 & 3); // L: 600 @@ -1002,7 +954,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 619 @ObfuscatedName("aq") - @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 622 int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623 @@ -1044,7 +995,6 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 651 @ObfuscatedName("al") - @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 654 var9 = 256 - var9; // L: 655 diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 5d7fb23347..31b6d6f409 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,19 +7,16 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { @ObfuscatedName("s") - @Export("pixels") public int[] pixels; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1282553935 ) - @Export("width") public int width; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1198737713 ) - @Export("height") public int height; protected AbstractRasterProvider() { @@ -31,7 +27,6 @@ public abstract class AbstractRasterProvider { descriptor = "(III)V", garbageValue = "-1964598850" ) - @Export("drawFull") public abstract void drawFull(int var1, int var2); @ObfuscatedName("s") @@ -39,7 +34,6 @@ public abstract class AbstractRasterProvider { descriptor = "(IIIII)V", garbageValue = "147756616" ) - @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); @ObfuscatedName("e") @@ -47,7 +41,6 @@ public abstract class AbstractRasterProvider { descriptor = "(I)V", garbageValue = "-1832212731" ) - @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 } // L: 12 diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index da4f7ff0e3..1746695207 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -1,5 +1,4 @@ import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -15,7 +14,6 @@ public abstract class AbstractSocket { descriptor = "(I)V", garbageValue = "-147773206" ) - @Export("close") public abstract void close(); @ObfuscatedName("k") @@ -23,7 +21,6 @@ public abstract class AbstractSocket { descriptor = "(B)I", garbageValue = "-99" ) - @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; @ObfuscatedName("s") @@ -31,7 +28,6 @@ public abstract class AbstractSocket { descriptor = "(B)I", garbageValue = "12" ) - @Export("available") public abstract int available() throws IOException; @ObfuscatedName("t") @@ -39,7 +35,6 @@ public abstract class AbstractSocket { descriptor = "(IB)Z", garbageValue = "-78" ) - @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; @ObfuscatedName("i") @@ -47,7 +42,6 @@ public abstract class AbstractSocket { descriptor = "([BIII)I", garbageValue = "-1533815985" ) - @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; @ObfuscatedName("x") @@ -55,7 +49,6 @@ public abstract class AbstractSocket { descriptor = "([BIIB)V", garbageValue = "52" ) - @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; @ObfuscatedName("hs") @@ -63,7 +56,6 @@ public abstract class AbstractSocket { descriptor = "(III)V", garbageValue = "1292618906" ) - @Export("resumePauseWidget") static void resumePauseWidget(int var0, int var1) { PacketBufferNode var2 = Client.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8130 var2.packetBuffer.method5654(var1); // L: 8131 diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index b4a6c0d323..4711525b6b 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,7 +5,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("AbstractSound") public abstract class AbstractSound extends Node { @ObfuscatedName("o") - @Export("position") int position; AbstractSound() { diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index bbcebab7ee..21b6be4e1d 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,10 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { @ObfuscatedName("gd") - @Export("regionLandArchives") static byte[][] regionLandArchives; @ObfuscatedName("k") - @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { @@ -22,7 +19,6 @@ public abstract class AbstractUserComparator implements Comparator { descriptor = "(Ljava/util/Comparator;B)V", garbageValue = "-9" ) - @Export("addComparator") final void addComparator(Comparator var1) { if (this.nextComparator == null) { // L: 11 this.nextComparator = var1; // L: 12 @@ -37,7 +33,6 @@ public abstract class AbstractUserComparator implements Comparator { descriptor = "(Ljc;Ljc;I)I", garbageValue = "1339061941" ) - @Export("compareUser") protected final int compareUser(User var1, User var2) { return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); // L: 20 21 } @@ -51,7 +46,6 @@ public abstract class AbstractUserComparator implements Comparator { descriptor = "(Lic;III)Llp;", garbageValue = "-2098090850" ) - @Export("SpriteBuffer_getSprite") public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { byte[] var4 = var0.takeFile(var1, var2); // L: 96 boolean var3; @@ -70,7 +64,6 @@ public abstract class AbstractUserComparator implements Comparator { descriptor = "(Lhq;IIII)V", garbageValue = "-1377715845" ) - @Export("drawMinimap") static final void drawMinimap(Widget var0, int var1, int var2, int var3) { RouteStrategy.playPcmPlayers(); // L: 10551 SpriteMask var4 = var0.getSpriteMask(false); // L: 10552 diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 0292565045..05ee91ff68 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,5 +1,4 @@ import java.util.LinkedList; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,67 +9,55 @@ import net.runelite.rs.ScriptOpcodes; @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { @ObfuscatedName("gz") - @Export("regionMapArchives") static byte[][] regionMapArchives; @ObfuscatedName("hc") @ObfuscatedGetter( intValue = -1751628859 ) - @Export("cameraZ") static int cameraZ; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -79159629 ) - @Export("regionXLow") int regionXLow; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 522527831 ) - @Export("regionYLow") int regionYLow; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -2063226565 ) - @Export("regionX") int regionX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 480521769 ) - @Export("regionY") int regionY; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 946227363 ) - @Export("minPlane") int minPlane; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1771727323 ) - @Export("planes") int planes; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 10575415 ) - @Export("groupId") int groupId; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -466273533 ) - @Export("fileId") int fileId; @ObfuscatedName("g") - @Export("floorUnderlayIds") short[][][] floorUnderlayIds; @ObfuscatedName("m") - @Export("floorOverlayIds") short[][][] floorOverlayIds; @ObfuscatedName("n") byte[][][] field198; @@ -80,7 +67,6 @@ public abstract class AbstractWorldMapData { @ObfuscatedSignature( descriptor = "[[[[Laa;" ) - @Export("decorations") WorldMapDecoration[][][][] decorations; @ObfuscatedName("a") boolean field182; @@ -100,7 +86,6 @@ public abstract class AbstractWorldMapData { descriptor = "(Lkf;I)V", garbageValue = "728123848" ) - @Export("readGeography") abstract void readGeography(Buffer var1); @ObfuscatedName("w") @@ -108,7 +93,6 @@ public abstract class AbstractWorldMapData { descriptor = "(B)Z", garbageValue = "83" ) - @Export("isFullyLoaded") boolean isFullyLoaded() { return this.field182 && this.field194; // L: 32 } @@ -118,7 +102,6 @@ public abstract class AbstractWorldMapData { descriptor = "(Lic;B)V", garbageValue = "-109" ) - @Export("loadGeography") void loadGeography(AbstractArchive var1) { if (!this.isFullyLoaded()) { // L: 36 byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 @@ -136,7 +119,6 @@ public abstract class AbstractWorldMapData { descriptor = "(I)V", garbageValue = "-2117739140" ) - @Export("reset") void reset() { this.floorUnderlayIds = null; // L: 46 this.floorOverlayIds = null; // L: 47 @@ -152,7 +134,6 @@ public abstract class AbstractWorldMapData { descriptor = "(IILkf;I)V", garbageValue = "-1176902168" ) - @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); // L: 56 if (var4 != 0) { // L: 57 @@ -228,7 +209,6 @@ public abstract class AbstractWorldMapData { descriptor = "(I)I", garbageValue = "-1414029315" ) - @Export("getRegionX") int getRegionX() { return this.regionX; // L: 112 } @@ -238,7 +218,6 @@ public abstract class AbstractWorldMapData { descriptor = "(I)I", garbageValue = "-1685122418" ) - @Export("getRegionY") int getRegionY() { return this.regionY; // L: 116 } @@ -284,7 +263,6 @@ public abstract class AbstractWorldMapData { descriptor = "(III)V", garbageValue = "396183986" ) - @Export("changeWorldSelectSorting") static void changeWorldSelectSorting(int var0, int var1) { int[] var2 = new int[4]; // L: 63 int[] var3 = new int[4]; // L: 64 diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index e86f896a10..966bb1ccbe 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,6 +1,5 @@ import java.io.File; import java.io.RandomAccessFile; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,37 +12,31 @@ public abstract class AbstractWorldMapIcon { @ObfuscatedSignature( descriptor = "Lfa;" ) - @Export("clock") static Clock clock; @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("worldSelectFlagSprites") static IndexedSprite[] worldSelectFlagSprites; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lhg;" ) - @Export("coord2") public final Coord coord2; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lhg;" ) - @Export("coord1") public final Coord coord1; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 857445445 ) - @Export("screenX") int screenX; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -161924757 ) - @Export("screenY") int screenY; @ObfuscatedSignature( @@ -59,7 +52,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "-1613828162" ) - @Export("getElement") public abstract int getElement(); @ObfuscatedName("k") @@ -67,7 +59,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(I)Laq;", garbageValue = "499378708" ) - @Export("getLabel") abstract WorldMapLabel getLabel(); @ObfuscatedName("s") @@ -75,7 +66,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "182515130" ) - @Export("getSubWidth") abstract int getSubWidth(); @ObfuscatedName("t") @@ -83,7 +73,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "-2001682063" ) - @Export("getSubHeight") abstract int getSubHeight(); @ObfuscatedName("q") @@ -91,7 +80,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(III)Z", garbageValue = "1932387399" ) - @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { if (this.elementFitsScreen(var1, var2)) { // L: 18 return true; // L: 19 @@ -105,7 +93,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(I)Z", garbageValue = "-446281234" ) - @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } @@ -115,7 +102,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(IIB)Z", garbageValue = "-125" ) - @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; @@ -166,7 +152,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(III)Z", garbageValue = "706174732" ) - @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { WorldMapLabel var3 = this.getLabel(); // L: 79 if (var3 == null) { // L: 80 @@ -192,7 +177,6 @@ public abstract class AbstractWorldMapIcon { descriptor = "(Ljava/lang/String;I)Ljava/io/File;", garbageValue = "379993437" ) - @Export("getFile") static File getFile(String var0) { if (!FileSystem.FileSystem_hasPermissions) { // L: 22 throw new RuntimeException(""); diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index bbf41ebc7a..9faf81c823 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -3,7 +3,6 @@ import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.io.SyncFailedException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,19 +12,16 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("AccessFile") public final class AccessFile { @ObfuscatedName("z") - @Export("file") RandomAccessFile file; @ObfuscatedName("k") @ObfuscatedGetter( longValue = 3150548694811435977L ) - @Export("maxSize") final long maxSize; @ObfuscatedName("s") @ObfuscatedGetter( longValue = -5153103964935494605L ) - @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { @@ -50,7 +46,6 @@ public final class AccessFile { } // L: 24 @ObfuscatedName("z") - @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 @@ -61,7 +56,6 @@ public final class AccessFile { descriptor = "([BIII)V", garbageValue = "1923920098" ) - @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { if (this.offset + (long)var3 > this.maxSize) { // L: 32 this.file.seek(this.maxSize); // L: 33 @@ -78,7 +72,6 @@ public final class AccessFile { descriptor = "(B)V", garbageValue = "53" ) - @Export("close") public final void close() throws IOException { this.closeSync(false); // L: 42 } // L: 43 @@ -88,7 +81,6 @@ public final class AccessFile { descriptor = "(ZI)V", garbageValue = "-152121757" ) - @Export("closeSync") public final void closeSync(boolean var1) throws IOException { if (this.file != null) { // L: 46 if (var1) { // L: 47 @@ -109,7 +101,6 @@ public final class AccessFile { descriptor = "(B)J", garbageValue = "-78" ) - @Export("length") public final long length() throws IOException { return this.file.length(); // L: 59 } @@ -119,7 +110,6 @@ public final class AccessFile { descriptor = "([BIII)I", garbageValue = "-2147147589" ) - @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { int var4 = this.file.read(var1, var2, var3); // L: 63 if (var4 > 0) { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index cd9ddc641f..d7511f2c75 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,22 +11,18 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -2072659501 ) - @Export("x") int x; @ObfuscatedName("an") - @Export("isWalking") boolean isWalking; @ObfuscatedName("am") @ObfuscatedGetter( intValue = 1621996049 ) - @Export("y") int y; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = -572229331 ) - @Export("rotation") int rotation; @ObfuscatedName("au") @ObfuscatedGetter( @@ -38,61 +33,50 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 1649860163 ) - @Export("playerCycle") int playerCycle; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = -1340931717 ) - @Export("idleSequence") int idleSequence; @ObfuscatedName("at") @ObfuscatedGetter( intValue = 1622912625 ) - @Export("turnLeftSequence") int turnLeftSequence; @ObfuscatedName("aq") @ObfuscatedGetter( intValue = 1928797643 ) - @Export("turnRightSequence") int turnRightSequence; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 214300391 ) - @Export("walkSequence") int walkSequence; @ObfuscatedName("ah") @ObfuscatedGetter( intValue = 1491970759 ) - @Export("walkBackSequence") int walkBackSequence; @ObfuscatedName("av") @ObfuscatedGetter( intValue = -433468795 ) - @Export("walkLeftSequence") int walkLeftSequence; @ObfuscatedName("ax") @ObfuscatedGetter( intValue = -1020521095 ) - @Export("walkRightSequence") int walkRightSequence; @ObfuscatedName("as") @ObfuscatedGetter( intValue = 1963413453 ) - @Export("runSequence") int runSequence; @ObfuscatedName("az") - @Export("overheadText") String overheadText; @ObfuscatedName("ad") - @Export("isAutoChatting") boolean isAutoChatting; @ObfuscatedName("ai") boolean field986; @@ -100,52 +84,40 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 885225201 ) - @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; @ObfuscatedName("aj") @ObfuscatedGetter( intValue = 592862521 ) - @Export("overheadTextColor") int overheadTextColor; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = 231964227 ) - @Export("overheadTextEffect") int overheadTextEffect; @ObfuscatedName("ak") - @Export("hitSplatCount") byte hitSplatCount; @ObfuscatedName("ac") - @Export("hitSplatTypes") int[] hitSplatTypes; @ObfuscatedName("bl") - @Export("hitSplatValues") int[] hitSplatValues; @ObfuscatedName("bc") - @Export("hitSplatCycles") int[] hitSplatCycles; @ObfuscatedName("bz") - @Export("hitSplatTypes2") int[] hitSplatTypes2; @ObfuscatedName("bj") - @Export("hitSplatValues2") int[] hitSplatValues2; @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "Ljv;" ) - @Export("healthBars") IterableNodeDeque healthBars; @ObfuscatedName("bi") @ObfuscatedGetter( intValue = -1685554577 ) - @Export("targetIndex") int targetIndex; @ObfuscatedName("bg") - @Export("false0") boolean false0; @ObfuscatedName("br") @ObfuscatedGetter( @@ -156,43 +128,36 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 450756931 ) - @Export("movementSequence") int movementSequence; @ObfuscatedName("bn") @ObfuscatedGetter( intValue = 1637238895 ) - @Export("movementFrame") int movementFrame; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = 784527629 ) - @Export("movementFrameCycle") int movementFrameCycle; @ObfuscatedName("be") @ObfuscatedGetter( intValue = -218661123 ) - @Export("sequence") int sequence; @ObfuscatedName("bu") @ObfuscatedGetter( intValue = 1658984867 ) - @Export("sequenceFrame") int sequenceFrame; @ObfuscatedName("ba") @ObfuscatedGetter( intValue = -1886437137 ) - @Export("sequenceFrameCycle") int sequenceFrameCycle; @ObfuscatedName("bm") @ObfuscatedGetter( intValue = 1364114839 ) - @Export("sequenceDelay") int sequenceDelay; @ObfuscatedName("bd") @ObfuscatedGetter( @@ -203,19 +168,16 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = 1569897565 ) - @Export("spotAnimation") int spotAnimation; @ObfuscatedName("bx") @ObfuscatedGetter( intValue = -475440643 ) - @Export("spotAnimationFrame") int spotAnimationFrame; @ObfuscatedName("bq") @ObfuscatedGetter( intValue = -822724081 ) - @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; @ObfuscatedName("by") @ObfuscatedGetter( @@ -266,19 +228,16 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -1077536781 ) - @Export("npcCycle") int npcCycle; @ObfuscatedName("cv") @ObfuscatedGetter( intValue = -446174757 ) - @Export("defaultHeight") int defaultHeight; @ObfuscatedName("ce") @ObfuscatedGetter( intValue = -1431847965 ) - @Export("orientation") int orientation; @ObfuscatedName("cr") @ObfuscatedGetter( @@ -294,16 +253,12 @@ public abstract class Actor extends Entity { @ObfuscatedGetter( intValue = -775156313 ) - @Export("pathLength") int pathLength; @ObfuscatedName("cm") - @Export("pathX") int[] pathX; @ObfuscatedName("cu") - @Export("pathY") int[] pathY; @ObfuscatedName("cw") - @Export("pathTraversed") byte[] pathTraversed; @ObfuscatedName("cq") @ObfuscatedGetter( @@ -370,7 +325,6 @@ public abstract class Actor extends Entity { descriptor = "(I)Z", garbageValue = "68470795" ) - @Export("isVisible") boolean isVisible() { return false; // L: 81 } @@ -390,7 +344,6 @@ public abstract class Actor extends Entity { descriptor = "(IIIIIII)V", garbageValue = "733671711" ) - @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; // L: 85 boolean var8 = true; // L: 86 @@ -471,7 +424,6 @@ public abstract class Actor extends Entity { descriptor = "(IIIIIIB)V", garbageValue = "-47" ) - @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { HealthBarDefinition var7 = class204.method3780(var1); // L: 141 HealthBar var8 = null; // L: 142 @@ -518,7 +470,6 @@ public abstract class Actor extends Entity { descriptor = "(IB)V", garbageValue = "-28" ) - @Export("removeHealthBar") final void removeHealthBar(int var1) { HealthBarDefinition var2 = class204.method3780(var1); // L: 167 @@ -954,7 +905,6 @@ public abstract class Actor extends Entity { descriptor = "(Ljava/lang/String;ZI)V", garbageValue = "-1341362245" ) - @Export("drawLoadingMessage") static final void drawLoadingMessage(String var0, boolean var1) { if (Client.showLoadingMessages) { // L: 3963 byte var2 = 4; // L: 3964 diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 652aa2bc94..9a07c29ed3 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -18,25 +17,18 @@ public class Animation { @ObfuscatedSignature( descriptor = "Leh;" ) - @Export("skeleton") Skeleton skeleton; @ObfuscatedName("o") - @Export("transformCount") int transformCount; @ObfuscatedName("x") - @Export("transformSkeletonLabels") int[] transformSkeletonLabels; @ObfuscatedName("w") - @Export("transformXs") int[] transformXs; @ObfuscatedName("g") - @Export("transformYs") int[] transformYs; @ObfuscatedName("m") - @Export("transformZs") int[] transformZs; @ObfuscatedName("n") - @Export("hasAlphaTransform") boolean hasAlphaTransform; static { diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 261de77933..3893acf26d 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,5 +1,4 @@ import java.awt.FontMetrics; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,16 +11,13 @@ public class ApproximateRouteStrategy extends RouteStrategy { @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("sceneMinimapSprite") static Sprite sceneMinimapSprite; @ObfuscatedName("an") - @Export("loginScreenFontMetrics") static FontMetrics loginScreenFontMetrics; @ObfuscatedName("dp") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive12") static Archive archive12; ApproximateRouteStrategy() { @@ -32,7 +28,6 @@ public class ApproximateRouteStrategy extends RouteStrategy { descriptor = "(IIILft;I)Z", garbageValue = "-1274441547" ) - @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 10974 } @@ -42,7 +37,6 @@ public class ApproximateRouteStrategy extends RouteStrategy { descriptor = "(B)[Lix;", garbageValue = "64" ) - @Export("PlayerType_values") public static PlayerType[] PlayerType_values() { return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.field3131}; // L: 20 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 1d2a060c1c..feaa9ac07c 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -1,5 +1,4 @@ import java.util.zip.CRC32; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -9,44 +8,37 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Archive") public class Archive extends AbstractArchive { @ObfuscatedName("ao") - @Export("Archive_crc") static CRC32 Archive_crc; @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Llz;" ) - @Export("archiveDisk") ArchiveDisk archiveDisk; @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "Llz;" ) - @Export("masterDisk") ArchiveDisk masterDisk; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1943179967 ) - @Export("index") int index; @ObfuscatedName("e") volatile boolean field3185; @ObfuscatedName("ab") boolean field3186; @ObfuscatedName("ag") - @Export("validGroups") volatile boolean[] validGroups; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 865644011 ) - @Export("indexCrc") int indexCrc; @ObfuscatedName("an") @ObfuscatedGetter( intValue = -193414103 ) - @Export("indexVersion") int indexVersion; @ObfuscatedName("am") @ObfuscatedGetter( @@ -78,7 +70,6 @@ public class Archive extends AbstractArchive { descriptor = "(II)V", garbageValue = "176946518" ) - @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { SecureRandomCallable.method1204(this.index, var1); } @@ -88,7 +79,6 @@ public class Archive extends AbstractArchive { descriptor = "(II)I", garbageValue = "-21407020" ) - @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { // L: 200 return 100; @@ -102,7 +92,6 @@ public class Archive extends AbstractArchive { descriptor = "(II)V", garbageValue = "450530880" ) - @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48 ArchiveDisk var2 = this.archiveDisk; // L: 49 @@ -142,7 +131,6 @@ public class Archive extends AbstractArchive { descriptor = "(I)I", garbageValue = "-121154638" ) - @Export("percentage") public int percentage() { if (this.field3185) { // L: 36 return 100; @@ -163,7 +151,6 @@ public class Archive extends AbstractArchive { descriptor = "(III)V", garbageValue = "1573806265" ) - @Export("loadIndex") void loadIndex(int var1, int var2) { this.indexCrc = var1; // L: 73 this.indexVersion = var2; // L: 74 @@ -197,7 +184,6 @@ public class Archive extends AbstractArchive { descriptor = "(I[BZZB)V", garbageValue = "-85" ) - @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { // L: 101 if (this.field3185) { // L: 102 @@ -240,7 +226,6 @@ public class Archive extends AbstractArchive { descriptor = "(Llz;I[BZI)V", garbageValue = "-2086018580" ) - @Export("load") void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { // L: 132 @@ -319,7 +304,6 @@ public class Archive extends AbstractArchive { descriptor = "(I)V", garbageValue = "-1665634170" ) - @Export("loadAllLocal") void loadAllLocal() { this.validGroups = new boolean[super.groups.length]; // L: 183 @@ -370,7 +354,6 @@ public class Archive extends AbstractArchive { descriptor = "(B)I", garbageValue = "-18" ) - @Export("loadPercent") public int loadPercent() { int var1 = 0; // L: 214 int var2 = 0; // L: 215 diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index b9557bc50c..c8f0e28f78 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -1,6 +1,5 @@ import java.io.EOFException; import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,31 +9,26 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("ArchiveDisk") public final class ArchiveDisk { @ObfuscatedName("z") - @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lmz;" ) - @Export("datFile") BufferedFile datFile; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lmz;" ) - @Export("idxFile") BufferedFile idxFile; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 728284557 ) - @Export("archive") int archive; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -669464675 ) - @Export("maxEntrySize") int maxEntrySize; static { @@ -59,7 +53,6 @@ public final class ArchiveDisk { descriptor = "(II)[B", garbageValue = "881928186" ) - @Export("read") public byte[] read(int var1) { synchronized(this.datFile) { // L: 21 try { @@ -153,7 +146,6 @@ public final class ArchiveDisk { descriptor = "(I[BII)Z", garbageValue = "749770493" ) - @Export("write") public boolean write(int var1, byte[] var2, int var3) { synchronized(this.datFile) { // L: 76 if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77 @@ -174,7 +166,6 @@ public final class ArchiveDisk { descriptor = "(I[BIZB)Z", garbageValue = "-74" ) - @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { synchronized(this.datFile) { // L: 87 try { diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 12aaa9ef65..59a88fd264 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,22 +11,18 @@ public class ArchiveDiskAction extends Node { @ObfuscatedGetter( intValue = 1337486671 ) - @Export("type") int type; @ObfuscatedName("k") - @Export("data") byte[] data; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llz;" ) - @Export("archiveDisk") ArchiveDisk archiveDisk; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive") Archive archive; ArchiveDiskAction() { @@ -165,7 +160,6 @@ public class ArchiveDiskAction extends Node { descriptor = "(Ljava/lang/String;ZI)V", garbageValue = "-1075762777" ) - @Export("findItemDefinitions") static void findItemDefinitions(String var0, boolean var1) { var0 = var0.toLowerCase(); // L: 10783 short[] var2 = new short[16]; // L: 10784 diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 42df45e833..b91f635eb0 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,13 +10,11 @@ public class ArchiveDiskActionHandler implements Runnable { @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; @ObfuscatedName("s") @ObfuscatedGetter( @@ -25,13 +22,11 @@ public class ArchiveDiskActionHandler implements Runnable { ) public static int field3179; @ObfuscatedName("i") - @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("worldSelectRightSprite") static IndexedSprite worldSelectRightSprite; static { diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index cf48c60c4e..17499d8960 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,21 @@ public class ArchiveLoader { @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("crossSprites") static Sprite[] crossSprites; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive") final Archive archive; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -412619053 ) - @Export("groupCount") final int groupCount; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 486257523 ) - @Export("loadedCount") int loadedCount; @ObfuscatedSignature( @@ -46,7 +41,6 @@ public class ArchiveLoader { descriptor = "(I)Z", garbageValue = "-1957084823" ) - @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; // L: 17 @@ -80,7 +74,6 @@ public class ArchiveLoader { descriptor = "(IIII)I", garbageValue = "-513803575" ) - @Export("getTileHeight") static final int getTileHeight(int var0, int var1, int var2) { int var3 = var0 >> 7; // L: 4975 int var4 = var1 >> 7; // L: 4976 diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index de7a3fd398..be2f1faac2 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -1,5 +1,4 @@ import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,32 +12,27 @@ public enum AttackOption implements Enumerated { @ObfuscatedSignature( descriptor = "Lcd;" ) - @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lcd;" ) - @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lcd;" ) - @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lcd;" ) - @Export("AttackOption_hidden") AttackOption_hidden(3); @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1798928251 ) - @Export("id") final int id; AttackOption(int var3) { @@ -50,7 +44,6 @@ public enum AttackOption implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 10933 } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 6793b5502d..dec4f5fe39 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,15 +8,12 @@ public class AudioFilter { @ObfuscatedName("o") static float[][] field1512; @ObfuscatedName("x") - @Export("coefficients") static int[][] coefficients; @ObfuscatedName("w") static float field1514; @ObfuscatedName("g") - @Export("forwardMultiplier") static int forwardMultiplier; @ObfuscatedName("z") - @Export("pairs") int[] pairs; @ObfuscatedName("s") int[][][] field1509; @@ -53,7 +49,6 @@ public class AudioFilter { } @ObfuscatedName("t") - @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 @@ -151,7 +146,6 @@ public class AudioFilter { } // L: 99 @ObfuscatedName("k") - @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 return var1 * 3.1415927F / 11025.0F; // L: 31 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 7d3dbe20a3..f9dc19c9ea 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,7 +9,6 @@ public final class BZip2Decompressor { @ObfuscatedSignature( descriptor = "Lli;" ) - @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; static { @@ -18,7 +16,6 @@ public final class BZip2Decompressor { } @ObfuscatedName("z") - @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 BZip2Decompressor_state.inputArray = var2; // L: 21 @@ -168,7 +165,6 @@ public final class BZip2Decompressor { @ObfuscatedSignature( descriptor = "(Lli;)V" ) - @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { boolean var4 = false; // L: 151 boolean var5 = false; // L: 152 @@ -542,7 +538,6 @@ public final class BZip2Decompressor { @ObfuscatedSignature( descriptor = "(Lli;)B" ) - @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } @@ -551,7 +546,6 @@ public final class BZip2Decompressor { @ObfuscatedSignature( descriptor = "(Lli;)B" ) - @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } @@ -560,7 +554,6 @@ public final class BZip2Decompressor { @ObfuscatedSignature( descriptor = "(ILli;)I" ) - @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { while (var1.bsLive < var0) { // L: 456 var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; // L: 462 @@ -580,7 +573,6 @@ public final class BZip2Decompressor { @ObfuscatedSignature( descriptor = "(Lli;)V" ) - @Export("makeMaps") static void makeMaps(BZip2State var0) { var0.nInUse = 0; // L: 472 @@ -594,7 +586,6 @@ public final class BZip2Decompressor { } // L: 479 @ObfuscatedName("w") - @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 095e866e56..6ef3bc8517 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -7,7 +6,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("BZip2State") public final class BZip2State { @ObfuscatedName("bn") - @Export("worldListURL") static String worldListURL; @ObfuscatedName("z") final int field3754; @@ -22,34 +20,28 @@ public final class BZip2State { @ObfuscatedName("o") final int field3760; @ObfuscatedName("x") - @Export("inputArray") byte[] inputArray; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 839419927 ) - @Export("nextByte") int nextByte; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 128200733 ) - @Export("nextBit_unused") int nextBit_unused; @ObfuscatedName("m") - @Export("outputArray") byte[] outputArray; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -181699619 ) - @Export("next_out") int next_out; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 36041791 ) - @Export("outputLength") int outputLength; @ObfuscatedName("h") @ObfuscatedGetter( @@ -57,34 +49,28 @@ public final class BZip2State { ) int field3759; @ObfuscatedName("a") - @Export("out_char") byte out_char; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1965134077 ) - @Export("su_rNToGo") int su_rNToGo; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -807361971 ) - @Export("bsBuff") int bsBuff; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 705369625 ) - @Export("bsLive") int bsLive; @ObfuscatedName("y") - @Export("blockSize100k") int blockSize100k; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 1211957325 ) - @Export("originalPointer") int originalPointer; @ObfuscatedName("j") @ObfuscatedGetter( @@ -95,61 +81,44 @@ public final class BZip2State { @ObfuscatedGetter( intValue = 25295989 ) - @Export("su_ch2") int su_ch2; @ObfuscatedName("u") - @Export("unzftab") int[] unzftab; @ObfuscatedName("p") @ObfuscatedGetter( intValue = 1457026287 ) - @Export("nblocks_used") int nblocks_used; @ObfuscatedName("b") - @Export("cftab") int[] cftab; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1999043287 ) - @Export("nInUse") int nInUse; @ObfuscatedName("ab") - @Export("inUse") boolean[] inUse; @ObfuscatedName("ag") - @Export("inUse16") boolean[] inUse16; @ObfuscatedName("ao") - @Export("seqToUnseq") byte[] seqToUnseq; @ObfuscatedName("ae") - @Export("ll8") byte[] ll8; @ObfuscatedName("an") - @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; @ObfuscatedName("am") - @Export("selector") byte[] selector; @ObfuscatedName("ap") - @Export("selectorMtf") byte[] selectorMtf; @ObfuscatedName("au") - @Export("temp_charArray2d") byte[][] temp_charArray2d; @ObfuscatedName("aa") - @Export("limit") int[][] limit; @ObfuscatedName("ar") - @Export("base") int[][] base; @ObfuscatedName("at") - @Export("perm") int[][] perm; @ObfuscatedName("aq") - @Export("minLens") int[] minLens; @ObfuscatedName("al") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 604112a0cd..9b0b0b1747 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -1,6 +1,5 @@ import java.io.IOException; import java.security.SecureRandom; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,70 +12,58 @@ public final class BoundaryObject { @ObfuscatedGetter( intValue = 1982051309 ) - @Export("widgetDragDuration") static int widgetDragDuration; @ObfuscatedName("c") @ObfuscatedGetter( intValue = 1829902819 ) - @Export("graphicsTickTimeIdx") static int graphicsTickTimeIdx; @ObfuscatedName("gc") - @Export("xteaKeys") static int[][] xteaKeys; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1415372023 ) - @Export("orientationA") int orientationA; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -506654425 ) - @Export("tileHeight") int tileHeight; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1147548215 ) - @Export("x") int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1940819727 ) - @Export("y") int y; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1131836163 ) - @Export("orientationB") int orientationB; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("entity1") public Entity entity1; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("entity2") public Entity entity2; @ObfuscatedName("w") @ObfuscatedGetter( longValue = 6638213269109827123L ) - @Export("tag") public long tag; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1666155333 ) - @Export("flags") int flags; BoundaryObject() { diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 270c42fef2..17244775fc 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,31 +7,26 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Bounds") public class Bounds { @ObfuscatedName("w") - @Export("Widget_loadedInterfaces") public static boolean[] Widget_loadedInterfaces; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -942038373 ) - @Export("lowX") public int lowX; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -38208119 ) - @Export("lowY") public int lowY; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -468327151 ) - @Export("highX") public int highX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 85471293 ) - @Export("highY") public int highY; public Bounds(int var1, int var2, int var3, int var4) { @@ -49,7 +43,6 @@ public class Bounds { descriptor = "(III)V", garbageValue = "1517519205" ) - @Export("setLow") public void setLow(int var1, int var2) { this.lowX = var1; // L: 19 this.lowY = var2; // L: 20 @@ -60,7 +53,6 @@ public class Bounds { descriptor = "(III)V", garbageValue = "1357233631" ) - @Export("setHigh") public void setHigh(int var1, int var2) { this.highX = var1; // L: 24 this.highY = var2; // L: 25 diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 35e78cff2a..e3c3b31c09 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,19 +10,16 @@ public class Buddy extends User { @ObfuscatedGetter( intValue = 1220284933 ) - @Export("world") public int world; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -224698591 ) - @Export("int2") public int int2; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -263202513 ) - @Export("rank") public int rank; Buddy() { @@ -35,7 +31,6 @@ public class Buddy extends User { descriptor = "(III)V", garbageValue = "-580421822" ) - @Export("set") void set(int var1, int var2) { this.world = var1; // L: 11 this.int2 = var2; // L: 12 @@ -46,7 +41,6 @@ public class Buddy extends User { descriptor = "(I)I", garbageValue = "-907221261" ) - @Export("getWorld") public int getWorld() { return this.world; // L: 16 } @@ -56,7 +50,6 @@ public class Buddy extends User { descriptor = "(S)Z", garbageValue = "4837" ) - @Export("hasWorld") public boolean hasWorld() { return this.world > 0; // L: 20 } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index f8961d9dc3..a2bfe86528 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,16 +10,13 @@ public class BuddyRankComparator extends AbstractUserComparator { @ObfuscatedGetter( intValue = 841228159 ) - @Export("musicTrackGroupId") public static int musicTrackGroupId; @ObfuscatedName("jo") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("dragInventoryWidget") static Widget dragInventoryWidget; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { @@ -32,7 +28,6 @@ public class BuddyRankComparator extends AbstractUserComparator { descriptor = "(Lko;Lko;I)I", garbageValue = "-895598946" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var2.rank != var1.rank) { // L: 14 return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index df7b1134e7..51aa340b70 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -1,5 +1,4 @@ import java.math.BigInteger; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -9,19 +8,15 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Buffer") public class Buffer extends Node { @ObfuscatedName("w") - @Export("crc32Table") static int[] crc32Table; @ObfuscatedName("m") - @Export("crc64Table") static long[] crc64Table; @ObfuscatedName("o") - @Export("array") public byte[] array; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -249160527 ) - @Export("offset") public int offset; static { @@ -75,7 +70,6 @@ public class Buffer extends Node { descriptor = "(B)V", garbageValue = "0" ) - @Export("releaseArray") public void releaseArray() { if (this.array != null) { // L: 68 Canvas.ByteArrayPool_release(this.array); @@ -89,7 +83,6 @@ public class Buffer extends Node { descriptor = "(IS)V", garbageValue = "1229" ) - @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; // L: 73 } // L: 74 @@ -99,7 +92,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "-1689611223" ) - @Export("writeShort") public void writeShort(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 77 this.array[++this.offset - 1] = (byte)var1; // L: 78 @@ -110,7 +102,6 @@ public class Buffer extends Node { descriptor = "(IB)V", garbageValue = "77" ) - @Export("writeMedium") public void writeMedium(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 82 this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 83 @@ -122,7 +113,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "-471050402" ) - @Export("writeInt") public void writeInt(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 88 this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 89 @@ -131,7 +121,6 @@ public class Buffer extends Node { } // L: 92 @ObfuscatedName("ak") - @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 95 this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 96 @@ -142,7 +131,6 @@ public class Buffer extends Node { } // L: 101 @ObfuscatedName("ac") - @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 104 this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 105 @@ -159,7 +147,6 @@ public class Buffer extends Node { descriptor = "(ZI)V", garbageValue = "581507378" ) - @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); // L: 115 } // L: 116 @@ -169,7 +156,6 @@ public class Buffer extends Node { descriptor = "(Ljava/lang/String;I)V", garbageValue = "349369645" ) - @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { int var2 = var1.indexOf(0); // L: 123 if (var2 >= 0) { // L: 124 @@ -185,7 +171,6 @@ public class Buffer extends Node { descriptor = "(Ljava/lang/String;B)V", garbageValue = "99" ) - @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { int var2 = var1.indexOf(0); // L: 134 if (var2 >= 0) { // L: 135 @@ -202,7 +187,6 @@ public class Buffer extends Node { descriptor = "(Ljava/lang/CharSequence;I)V", garbageValue = "-1859415815" ) - @Export("writeCESU8") public void writeCESU8(CharSequence var1) { int var2 = FloorOverlayDefinition.method4871(var1); // L: 142 this.array[++this.offset - 1] = 0; // L: 143 @@ -236,7 +220,6 @@ public class Buffer extends Node { descriptor = "([BIII)V", garbageValue = "-894436385" ) - @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 173 this.array[++this.offset - 1] = var1[var4]; @@ -258,7 +241,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "-369089618" ) - @Export("writeLengthInt") public void writeLengthInt(int var1) { if (var1 < 0) { // L: 181 throw new IllegalArgumentException(); // L: 182 @@ -275,7 +257,6 @@ public class Buffer extends Node { descriptor = "(IB)V", garbageValue = "-50" ) - @Export("writeLengthShort") public void writeLengthShort(int var1) { if (var1 >= 0 && var1 <= 65535) { // L: 191 this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194 @@ -290,7 +271,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "1412060467" ) - @Export("writeLengthByte") public void writeLengthByte(int var1) { if (var1 >= 0 && var1 <= 255) { // L: 199 this.array[this.offset - var1 - 1] = (byte)var1; // L: 202 @@ -304,7 +284,6 @@ public class Buffer extends Node { descriptor = "(IB)V", garbageValue = "-92" ) - @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { if (var1 >= 0 && var1 < 128) { // L: 206 this.writeByte(var1); // L: 207 @@ -320,7 +299,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "-444619487" ) - @Export("writeVarInt") public void writeVarInt(int var1) { if ((var1 & -128) != 0) { // L: 218 if ((var1 & -16384) != 0) { // L: 219 @@ -346,7 +324,6 @@ public class Buffer extends Node { descriptor = "(I)I", garbageValue = "600497455" ) - @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; // L: 232 } @@ -356,7 +333,6 @@ public class Buffer extends Node { descriptor = "(B)B", garbageValue = "66" ) - @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; // L: 236 } @@ -366,7 +342,6 @@ public class Buffer extends Node { descriptor = "(S)I", garbageValue = "10687" ) - @Export("readUnsignedShort") public int readUnsignedShort() { this.offset += 2; // L: 240 return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 241 @@ -377,7 +352,6 @@ public class Buffer extends Node { descriptor = "(B)I", garbageValue = "72" ) - @Export("readShort") public int readShort() { this.offset += 2; // L: 245 int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 246 @@ -393,7 +367,6 @@ public class Buffer extends Node { descriptor = "(I)I", garbageValue = "914016533" ) - @Export("readMedium") public int readMedium() { this.offset += 3; // L: 252 return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 253 @@ -404,7 +377,6 @@ public class Buffer extends Node { descriptor = "(S)I", garbageValue = "28464" ) - @Export("readInt") public int readInt() { this.offset += 4; // L: 257 return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 258 @@ -415,7 +387,6 @@ public class Buffer extends Node { descriptor = "(I)J", garbageValue = "1145152498" ) - @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; // L: 262 long var3 = (long)this.readInt() & 4294967295L; // L: 263 @@ -427,7 +398,6 @@ public class Buffer extends Node { descriptor = "(B)Z", garbageValue = "63" ) - @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; // L: 268 } @@ -437,7 +407,6 @@ public class Buffer extends Node { descriptor = "(I)Ljava/lang/String;", garbageValue = "706645017" ) - @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { if (this.array[this.offset] == 0) { // L: 272 ++this.offset; // L: 273 @@ -452,7 +421,6 @@ public class Buffer extends Node { descriptor = "(B)Ljava/lang/String;", garbageValue = "95" ) - @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { int var1 = this.offset; // L: 280 @@ -468,7 +436,6 @@ public class Buffer extends Node { descriptor = "(B)Ljava/lang/String;", garbageValue = "-101" ) - @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { byte var1 = this.array[++this.offset - 1]; // L: 288 if (var1 != 0) { // L: 289 @@ -489,7 +456,6 @@ public class Buffer extends Node { descriptor = "(I)Ljava/lang/String;", garbageValue = "2118487667" ) - @Export("readCESU8") public String readCESU8() { byte var1 = this.array[++this.offset - 1]; // L: 298 if (var1 != 0) { // L: 299 @@ -562,7 +528,6 @@ public class Buffer extends Node { descriptor = "([BIIB)V", garbageValue = "0" ) - @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = this.array[++this.offset - 1]; // L: 351 @@ -575,7 +540,6 @@ public class Buffer extends Node { descriptor = "(B)I", garbageValue = "0" ) - @Export("readShortSmart") public int readShortSmart() { int var1 = this.array[this.offset] & 255; // L: 355 return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 356 357 @@ -586,7 +550,6 @@ public class Buffer extends Node { descriptor = "(I)I", garbageValue = "573846843" ) - @Export("readUShortSmart") public int readUShortSmart() { int var1 = this.array[this.offset] & 255; // L: 361 return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 362 363 @@ -637,7 +600,6 @@ public class Buffer extends Node { descriptor = "(B)I", garbageValue = "-24" ) - @Export("readVarInt") public int readVarInt() { byte var1 = this.array[++this.offset - 1]; // L: 390 @@ -654,7 +616,6 @@ public class Buffer extends Node { descriptor = "([IB)V", garbageValue = "0" ) - @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { int var2 = this.offset / 8; // L: 400 this.offset = 0; // L: 401 @@ -682,7 +643,6 @@ public class Buffer extends Node { descriptor = "([II)V", garbageValue = "-391802168" ) - @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { int var2 = this.offset / 8; // L: 420 this.offset = 0; // L: 421 @@ -710,7 +670,6 @@ public class Buffer extends Node { descriptor = "([IIII)V", garbageValue = "-1086697970" ) - @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { int var4 = this.offset; // L: 440 this.offset = var2; // L: 441 @@ -740,7 +699,6 @@ public class Buffer extends Node { descriptor = "([IIIB)V", garbageValue = "111" ) - @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { int var4 = this.offset; // L: 462 this.offset = var2; // L: 463 @@ -770,7 +728,6 @@ public class Buffer extends Node { descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", garbageValue = "-1998456113" ) - @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { int var3 = this.offset; // L: 484 this.offset = 0; // L: 485 @@ -789,7 +746,6 @@ public class Buffer extends Node { descriptor = "(II)I", garbageValue = "277387180" ) - @Export("writeCrc") public int writeCrc(int var1) { byte[] var3 = this.array; // L: 498 int var4 = this.offset; // L: 499 @@ -809,7 +765,6 @@ public class Buffer extends Node { descriptor = "(I)Z", garbageValue = "-1944905387" ) - @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; // L: 514 byte[] var2 = this.array; // L: 516 @@ -849,7 +804,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "-1046245184" ) - @Export("writeIntME") public void writeIntME(int var1) { this.array[++this.offset - 1] = (byte)(128 - var1); // L: 541 } // L: 542 @@ -1048,7 +1002,6 @@ public class Buffer extends Node { descriptor = "(II)V", garbageValue = "-383188135" ) - @Export("writeShortLE") public void writeShortLE(int var1) { this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 638 this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 639 diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 112fb84b36..7a057ec293 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -1,6 +1,5 @@ import java.io.EOFException; import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,61 +12,50 @@ public class BufferedFile { @ObfuscatedSignature( descriptor = "Lmy;" ) - @Export("accessFile") AccessFile accessFile; @ObfuscatedName("s") - @Export("readBuffer") byte[] readBuffer; @ObfuscatedName("t") @ObfuscatedGetter( longValue = 9179108447436471203L ) - @Export("readBufferOffset") long readBufferOffset; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 405113093 ) - @Export("readBufferLength") int readBufferLength; @ObfuscatedName("o") - @Export("writeBuffer") byte[] writeBuffer; @ObfuscatedName("x") @ObfuscatedGetter( longValue = -2663227867343054731L ) - @Export("writeBufferOffset") long writeBufferOffset; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -44681909 ) - @Export("writeBufferLength") int writeBufferLength; @ObfuscatedName("g") @ObfuscatedGetter( longValue = 8904526348477535207L ) - @Export("offset") long offset; @ObfuscatedName("m") @ObfuscatedGetter( longValue = 3315460692689798849L ) - @Export("fileLength") long fileLength; @ObfuscatedName("n") @ObfuscatedGetter( longValue = -7074391582166578327L ) - @Export("length") long length; @ObfuscatedName("d") @ObfuscatedGetter( longValue = 8487172473192178189L ) - @Export("fileOffset") long fileOffset; @ObfuscatedSignature( @@ -89,14 +77,12 @@ public class BufferedFile { descriptor = "(B)V", garbageValue = "-33" ) - @Export("close") public void close() throws IOException { this.flush(); // L: 28 this.accessFile.close(); // L: 29 } // L: 30 @ObfuscatedName("k") - @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 throw new IOException(""); @@ -110,7 +96,6 @@ public class BufferedFile { descriptor = "(I)J", garbageValue = "-1539100429" ) - @Export("length") public long length() { return this.length; // L: 38 } @@ -120,7 +105,6 @@ public class BufferedFile { descriptor = "([BI)V", garbageValue = "-1457343734" ) - @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 @@ -130,7 +114,6 @@ public class BufferedFile { descriptor = "([BIII)V", garbageValue = "779663490" ) - @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { if (var3 + var2 > var1.length) { // L: 47 @@ -236,7 +219,6 @@ public class BufferedFile { descriptor = "(I)V", garbageValue = "1341738722" ) - @Export("load") void load() throws IOException { this.readBufferLength = 0; // L: 128 if (this.offset != this.fileOffset) { // L: 129 @@ -266,7 +248,6 @@ public class BufferedFile { descriptor = "([BIII)V", garbageValue = "329860365" ) - @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { if ((long)var3 + this.offset > this.length) { // L: 146 @@ -344,7 +325,6 @@ public class BufferedFile { descriptor = "(I)V", garbageValue = "-236075933" ) - @Export("flush") void flush() throws IOException { if (-1L != this.writeBufferOffset) { // L: 203 if (this.fileOffset != this.writeBufferOffset) { // L: 204 diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index a9dcc07166..84ceedefaa 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -1,6 +1,5 @@ import java.io.IOException; import java.net.Socket; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,19 +8,16 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { @ObfuscatedName("z") - @Export("socket") Socket socket; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Llx;" ) - @Export("source") BufferedSource source; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llf;" ) - @Export("sink") BufferedSink sink; BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { @@ -39,7 +35,6 @@ public class BufferedNetSocket extends AbstractSocket { descriptor = "(I)V", garbageValue = "-147773206" ) - @Export("close") public void close() { this.sink.close(); // L: 42 @@ -56,7 +51,6 @@ public class BufferedNetSocket extends AbstractSocket { descriptor = "(B)I", garbageValue = "-99" ) - @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); // L: 30 } @@ -66,7 +60,6 @@ public class BufferedNetSocket extends AbstractSocket { descriptor = "(B)I", garbageValue = "12" ) - @Export("available") public int available() throws IOException { return this.source.available(); // L: 26 } @@ -76,7 +69,6 @@ public class BufferedNetSocket extends AbstractSocket { descriptor = "(IB)Z", garbageValue = "-78" ) - @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); // L: 22 } @@ -86,7 +78,6 @@ public class BufferedNetSocket extends AbstractSocket { descriptor = "([BIII)I", garbageValue = "-1533815985" ) - @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); // L: 34 } @@ -96,7 +87,6 @@ public class BufferedNetSocket extends AbstractSocket { descriptor = "([BIIB)V", garbageValue = "52" ) - @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); // L: 38 } // L: 39 diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 609b5a5904..b11b54a224 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -1,6 +1,5 @@ import java.io.IOException; import java.io.OutputStream; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,37 +9,29 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("BufferedSink") public class BufferedSink implements Runnable { @ObfuscatedName("z") - @Export("thread") Thread thread; @ObfuscatedName("k") - @Export("outputStream") OutputStream outputStream; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 744968193 ) - @Export("capacity") int capacity; @ObfuscatedName("t") - @Export("buffer") byte[] buffer; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -683527295 ) - @Export("position") int position; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 870280175 ) - @Export("limit") int limit; @ObfuscatedName("x") - @Export("exception") IOException exception; @ObfuscatedName("w") - @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { @@ -59,7 +50,6 @@ public class BufferedSink implements Runnable { descriptor = "(B)Z", garbageValue = "8" ) - @Export("isClosed") boolean isClosed() { if (this.closed) { // L: 201 try { @@ -84,7 +74,6 @@ public class BufferedSink implements Runnable { descriptor = "([BIII)V", garbageValue = "803679823" ) - @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261 synchronized(this) { // L: 262 @@ -124,7 +113,6 @@ public class BufferedSink implements Runnable { descriptor = "(S)V", garbageValue = "256" ) - @Export("close") void close() { synchronized(this) { // L: 282 this.closed = true; // L: 283 diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index c93134402e..c758b150e0 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -1,7 +1,6 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,34 +10,27 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("BufferedSource") public class BufferedSource implements Runnable { @ObfuscatedName("z") - @Export("thread") Thread thread; @ObfuscatedName("k") - @Export("inputStream") InputStream inputStream; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1790809931 ) - @Export("capacity") int capacity; @ObfuscatedName("t") - @Export("buffer") byte[] buffer; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -264397639 ) - @Export("position") int position; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1799802211 ) - @Export("limit") int limit; @ObfuscatedName("x") - @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { @@ -57,7 +49,6 @@ public class BufferedSource implements Runnable { descriptor = "(II)Z", garbageValue = "-1870168211" ) - @Export("isAvailable") boolean isAvailable(int var1) throws IOException { if (var1 == 0) { // L: 106 return true; @@ -91,7 +82,6 @@ public class BufferedSource implements Runnable { descriptor = "(I)I", garbageValue = "-1796836135" ) - @Export("available") int available() throws IOException { synchronized(this) { // L: 122 int var2; @@ -115,7 +105,6 @@ public class BufferedSource implements Runnable { descriptor = "(I)I", garbageValue = "1217698749" ) - @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { // L: 135 if (this.position == this.limit) { // L: 136 @@ -138,7 +127,6 @@ public class BufferedSource implements Runnable { descriptor = "([BIII)I", garbageValue = "315484651" ) - @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 148 synchronized(this) { // L: 149 @@ -179,7 +167,6 @@ public class BufferedSource implements Runnable { descriptor = "(I)V", garbageValue = "-1698989409" ) - @Export("close") void close() { synchronized(this) { // L: 170 if (this.exception == null) { diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index b1348062a4..a1c05e580b 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,7 +5,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("ByteArrayNode") public class ByteArrayNode extends Node { @ObfuscatedName("z") - @Export("byteArray") public byte[] byteArray; public ByteArrayNode(byte[] var1) { diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 3e32a8b707..88be313d82 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,43 +10,33 @@ public class ByteArrayPool { @ObfuscatedGetter( intValue = -2025901059 ) - @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1213393185 ) - @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1641573055 ) - @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; @ObfuscatedName("t") - @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; @ObfuscatedName("i") - @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; @ObfuscatedName("o") - @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; @ObfuscatedName("x") - @Export("ByteArrayPool_alternativeSizes") static int[] ByteArrayPool_alternativeSizes; @ObfuscatedName("w") - @Export("ByteArrayPool_altSizeArrayCounts") static int[] ByteArrayPool_altSizeArrayCounts; @ObfuscatedName("g") - @Export("ByteArrayPool_arrays") static byte[][][] ByteArrayPool_arrays; @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "Lbo;" ) - @Export("mouseRecorder") static MouseRecorder mouseRecorder; static { @@ -64,7 +53,6 @@ public class ByteArrayPool { descriptor = "(IZB)[B", garbageValue = "29" ) - @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; if (var0 != 100) { // L: 35 diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 9fd29c33c3..c624f3a7e1 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,5 +1,4 @@ import java.util.TimeZone; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,13 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Calendar") public class Calendar { @ObfuscatedName("z") - @Export("MONTH_NAMES_ENGLISH_GERMAN") static final String[][] MONTH_NAMES_ENGLISH_GERMAN; @ObfuscatedName("k") - @Export("DAYS_OF_THE_WEEK") static final String[] DAYS_OF_THE_WEEK; @ObfuscatedName("s") - @Export("Calendar_calendar") static java.util.Calendar Calendar_calendar; @ObfuscatedName("x") public static short[] field2535; diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index d8cb549309..7b6f01f57c 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,6 +1,5 @@ import java.awt.Component; import java.awt.Graphics; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -14,7 +13,6 @@ public final class Canvas extends java.awt.Canvas { ) static Widget field438; @ObfuscatedName("z") - @Export("component") Component component; Canvas(Component var1) { @@ -48,7 +46,6 @@ public final class Canvas extends java.awt.Canvas { descriptor = "([BI)V", garbageValue = "1073407655" ) - @Export("ByteArrayPool_release") public static synchronized void ByteArrayPool_release(byte[] var0) { if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 @@ -74,7 +71,6 @@ public final class Canvas extends java.awt.Canvas { descriptor = "(Lct;B)V", garbageValue = "-37" ) - @Export("changeWorld") static void changeWorld(World var0) { if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1720 Client.isMembersWorld = var0.isMembersOnly(); // L: 1721 diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 583832f9f5..3ef7965915 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,19 +10,16 @@ public class ChatChannel { @ObfuscatedGetter( intValue = -1406179309 ) - @Export("menuX") static int menuX; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "[Lbk;" ) - @Export("messages") Message[] messages; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1207472641 ) - @Export("count") int count; ChatChannel() { @@ -35,7 +31,6 @@ public class ChatChannel { descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbk;", garbageValue = "-1549087177" ) - @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { Message var5 = this.messages[99]; // L: 89 @@ -66,7 +61,6 @@ public class ChatChannel { descriptor = "(II)Lbk;", garbageValue = "1867589012" ) - @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 106 107 } @@ -76,7 +70,6 @@ public class ChatChannel { descriptor = "(I)I", garbageValue = "-1452572127" ) - @Export("size") int size() { return this.count; // L: 111 } @@ -86,7 +79,6 @@ public class ChatChannel { descriptor = "(IIIIIZI)Llp;", garbageValue = "-1593670187" ) - @Export("getItemSprite") public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { if (var1 == -1) { // L: 353 var4 = 0; @@ -208,7 +200,6 @@ public class ChatChannel { descriptor = "(IIIIII)V", garbageValue = "-2146534087" ) - @Export("drawObject") static final void drawObject(int var0, int var1, int var2, int var3, int var4) { long var5 = ScriptEvent.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5182 int var7; diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 855c1035ca..a8931d411e 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,28 +10,22 @@ public class ClanChat extends UserList { @ObfuscatedSignature( descriptor = "Lmu;" ) - @Export("loginType") final LoginType loginType; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lkp;" ) - @Export("localUser") final Usernamed localUser; @ObfuscatedName("m") - @Export("name") public String name; @ObfuscatedName("n") - @Export("owner") public String owner; @ObfuscatedName("d") - @Export("minKick") public byte minKick; @ObfuscatedName("h") @ObfuscatedGetter( intValue = 996591213 ) - @Export("rank") public int rank; @ObfuscatedName("a") @ObfuscatedGetter( @@ -57,7 +50,6 @@ public class ClanChat extends UserList { descriptor = "(B)Ljc;", garbageValue = "35" ) - @Export("newInstance") User newInstance() { return new ClanMate(); // L: 24 } @@ -67,7 +59,6 @@ public class ClanChat extends UserList { descriptor = "(IB)[Ljc;", garbageValue = "-19" ) - @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; // L: 28 } @@ -77,7 +68,6 @@ public class ClanChat extends UserList { descriptor = "(Ljava/lang/String;I)V", garbageValue = "-2006450135" ) - @Export("readName") final void readName(String var1) { long var5 = 0L; // L: 36 int var7 = var1.length(); // L: 37 @@ -115,7 +105,6 @@ public class ClanChat extends UserList { descriptor = "(Ljava/lang/String;B)V", garbageValue = "-13" ) - @Export("setOwner") final void setOwner(String var1) { long var5 = 0L; // L: 61 int var7 = var1.length(); // L: 62 @@ -153,7 +142,6 @@ public class ClanChat extends UserList { descriptor = "(Lkf;I)V", garbageValue = "-140522773" ) - @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 long var2 = var1.readLong(); // L: 83 @@ -222,7 +210,6 @@ public class ClanChat extends UserList { descriptor = "(I)V", garbageValue = "-1118151470" ) - @Export("clearFriends") public final void clearFriends() { for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 126 ((ClanMate)this.get(var1)).clearIsFriend(); // L: 127 @@ -235,7 +222,6 @@ public class ClanChat extends UserList { descriptor = "(I)V", garbageValue = "1383721491" ) - @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 132 ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 133 @@ -248,7 +234,6 @@ public class ClanChat extends UserList { descriptor = "(Ljf;I)V", garbageValue = "-1871849373" ) - @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { if (var1.getUsername().equals(this.localUser.username())) { // L: 138 this.rank = var1.rank; @@ -261,7 +246,6 @@ public class ClanChat extends UserList { descriptor = "(I)Z", garbageValue = "2030161914" ) - @Export("getTapToDrop") static boolean getTapToDrop() { return Client.tapToDrop; // L: 9635 } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 137055954a..11798ceb24 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class ClanMate extends Buddy { @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("friend") TriBool friend; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("ignored") TriBool ignored; ClanMate() { @@ -29,7 +26,6 @@ public class ClanMate extends Buddy { descriptor = "(I)V", garbageValue = "-1483080876" ) - @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 @@ -39,7 +35,6 @@ public class ClanMate extends Buddy { descriptor = "(I)Z", garbageValue = "2093407981" ) - @Export("isFriend") public final boolean isFriend() { if (this.friend == TriBool.TriBool_unknown) { // L: 16 this.fillIsFriend(); // L: 17 @@ -53,7 +48,6 @@ public class ClanMate extends Buddy { descriptor = "(I)V", garbageValue = "-2130404233" ) - @Export("fillIsFriend") void fillIsFriend() { this.friend = class60.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 @@ -63,7 +57,6 @@ public class ClanMate extends Buddy { descriptor = "(I)V", garbageValue = "405113093" ) - @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 @@ -73,7 +66,6 @@ public class ClanMate extends Buddy { descriptor = "(I)Z", garbageValue = "-607786293" ) - @Export("isIgnored") public final boolean isIgnored() { if (this.ignored == TriBool.TriBool_unknown) { // L: 31 this.fillIsIgnored(); // L: 32 @@ -87,7 +79,6 @@ public class ClanMate extends Buddy { descriptor = "(I)V", garbageValue = "-483165617" ) - @Export("fillIsIgnored") void fillIsIgnored() { this.ignored = class60.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index fbdc5084de..907bfce653 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -18,7 +17,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("clickedWidget") static Widget clickedWidget; @ObfuscatedName("ox") @ObfuscatedGetter( @@ -29,7 +27,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -548379031 ) - @Export("rootWidgetCount") static int rootWidgetCount; @ObfuscatedName("ob") @ObfuscatedGetter( @@ -48,10 +45,8 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -565689219 ) - @Export("cycleCntr") static int cycleCntr; @ObfuscatedName("ol") - @Export("isResizable") static boolean isResizable; @ObfuscatedName("sr") @ObfuscatedGetter( @@ -71,13 +66,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1698989409 ) - @Export("widgetClickX") static int widgetClickX; @ObfuscatedName("nl") @ObfuscatedGetter( intValue = 907230791 ) - @Export("widgetClickY") static int widgetClickY; @ObfuscatedName("ng") @ObfuscatedGetter( @@ -88,19 +81,15 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("widgetFlags") static NodeHashTable widgetFlags; @ObfuscatedName("ny") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("clickedWidgetParent") static Widget clickedWidgetParent; @ObfuscatedName("os") - @Export("rootWidgetXs") static int[] rootWidgetXs; @ObfuscatedName("ou") - @Export("rootWidgetWidths") static int[] rootWidgetWidths; @ObfuscatedName("nr") @ObfuscatedGetter( @@ -111,25 +100,20 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("viewportWidget") static Widget viewportWidget; @ObfuscatedName("ov") @ObfuscatedGetter( intValue = 2115914755 ) - @Export("gameDrawingMode") static int gameDrawingMode; @ObfuscatedName("oy") - @Export("rootWidgetYs") static int[] rootWidgetYs; @ObfuscatedName("mb") @ObfuscatedGetter( intValue = -1986502797 ) - @Export("staffModLevel") static int staffModLevel; @ObfuscatedName("om") - @Export("rootWidgetHeights") static int[] rootWidgetHeights; @ObfuscatedName("nz") @ObfuscatedGetter( @@ -145,7 +129,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("scriptEvents") static NodeDeque scriptEvents; @ObfuscatedName("nd") @ObfuscatedGetter( @@ -171,7 +154,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1071833827 ) - @Export("currentTrackGroupId") static int currentTrackGroupId; @ObfuscatedName("nw") static int[] field863; @@ -180,40 +162,33 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("tv") static int[] field952; @ObfuscatedName("nv") - @Export("isDraggingWidget") static boolean isDraggingWidget; @ObfuscatedName("mj") @ObfuscatedGetter( intValue = 965072955 ) - @Export("runEnergy") static int runEnergy; @ObfuscatedName("qr") @ObfuscatedGetter( intValue = -259926039 ) - @Export("destinationX") static int destinationX; @ObfuscatedName("mk") @ObfuscatedGetter( intValue = 706119953 ) - @Export("weight") static int weight; @ObfuscatedName("qe") @ObfuscatedGetter( intValue = 347041669 ) - @Export("destinationY") static int destinationY; @ObfuscatedName("ow") @ObfuscatedGetter( intValue = 1612540519 ) - @Export("mouseWheelRotation") static int mouseWheelRotation; @ObfuscatedName("ro") - @Export("isCameraLocked") static boolean isCameraLocked; @ObfuscatedName("ss") @ObfuscatedGetter( @@ -224,13 +199,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Lha;" ) - @Export("playerAppearance") static PlayerAppearance playerAppearance; @ObfuscatedName("qf") @ObfuscatedGetter( intValue = -812618355 ) - @Export("areaSoundEffectVolume") static int areaSoundEffectVolume; @ObfuscatedName("rz") static boolean[] field922; @@ -243,64 +216,51 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("draggedOnWidget") static Widget draggedOnWidget; @ObfuscatedName("qn") @ObfuscatedGetter( intValue = -751525007 ) - @Export("soundEffectCount") static int soundEffectCount; @ObfuscatedName("qo") - @Export("soundEffectIds") static int[] soundEffectIds; @ObfuscatedName("mq") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("meslayerContinueWidget") static Widget meslayerContinueWidget; @ObfuscatedName("qi") - @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; @ObfuscatedName("qa") @ObfuscatedGetter( intValue = 1720412197 ) - @Export("musicVolume") static int musicVolume; @ObfuscatedName("qp") - @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; @ObfuscatedName("sn") - @Export("archiveLoaders") static ArrayList archiveLoaders; @ObfuscatedName("qx") @ObfuscatedSignature( descriptor = "[Ldj;" ) - @Export("soundEffects") static SoundEffect[] soundEffects; @ObfuscatedName("se") @ObfuscatedGetter( intValue = 1815598231 ) - @Export("archiveLoadersDone") static int archiveLoadersDone; @ObfuscatedName("qt") - @Export("soundLocations") static int[] soundLocations; @ObfuscatedName("qd") @ObfuscatedGetter( intValue = -549724569 ) - @Export("minimapState") static int minimapState; @ObfuscatedName("qv") @ObfuscatedGetter( intValue = 512054773 ) - @Export("soundEffectVolume") static int soundEffectVolume; @ObfuscatedName("pd") @ObfuscatedGetter( @@ -316,13 +276,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 131534275 ) - @Export("chatEffects") static int chatEffects; @ObfuscatedName("st") @ObfuscatedSignature( descriptor = "Lmo;" ) - @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; @ObfuscatedName("mv") @ObfuscatedGetter( @@ -333,20 +291,17 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1491507455 ) - @Export("followerIndex") static int followerIndex; @ObfuscatedName("pn") @ObfuscatedGetter( intValue = -1223881297 ) - @Export("mapIconCount") static int mapIconCount; @ObfuscatedName("rw") static short field769; @ObfuscatedName("ru") static short field928; @ObfuscatedName("np") - @Export("changedItemContainers") static int[] changedItemContainers; @ObfuscatedName("rm") static short field938; @@ -356,7 +311,6 @@ public final class Client extends GameShell implements Usernamed { ) static int field903; @ObfuscatedName("pl") - @Export("mapIconXs") static int[] mapIconXs; @ObfuscatedName("ry") static short field934; @@ -366,7 +320,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1522828843 ) - @Export("viewportZoom") static int viewportZoom; @ObfuscatedName("rq") static short field931; @@ -374,16 +327,13 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 112709455 ) - @Export("viewportWidth") static int viewportWidth; @ObfuscatedName("pf") @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("mapIcons") static Sprite[] mapIcons; @ObfuscatedName("pk") - @Export("mapIconYs") static int[] mapIconYs; @ObfuscatedName("od") @ObfuscatedGetter( @@ -399,13 +349,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1397478813 ) - @Export("viewportHeight") static int viewportHeight; @ObfuscatedName("rg") @ObfuscatedGetter( intValue = 1838939771 ) - @Export("viewportOffsetX") static int viewportOffsetX; @ObfuscatedName("oj") @ObfuscatedGetter( @@ -416,25 +364,20 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1729596091 ) - @Export("viewportOffsetY") static int viewportOffsetY; @ObfuscatedName("ps") @ObfuscatedGetter( intValue = -1158906153 ) - @Export("tradeChatMode") static int tradeChatMode; @ObfuscatedName("pc") @ObfuscatedGetter( intValue = -1755840079 ) - @Export("publicChatMode") static int publicChatMode; @ObfuscatedName("rd") - @Export("zoomHeight") static short zoomHeight; @ObfuscatedName("rv") - @Export("zoomWidth") static short zoomWidth; @ObfuscatedName("su") @ObfuscatedGetter( @@ -454,7 +397,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "[Lv;" ) - @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; @ObfuscatedName("ok") @ObfuscatedSignature( @@ -485,18 +427,15 @@ public final class Client extends GameShell implements Usernamed { ) static int field840; @ObfuscatedName("mm") - @Export("playerMod") static boolean playerMod; @ObfuscatedName("pj") static long[] field896; @ObfuscatedName("nq") - @Export("changedSkills") static int[] changedSkills; @ObfuscatedName("nu") @ObfuscatedGetter( intValue = -1157540783 ) - @Export("changedSkillsCount") static int changedSkillsCount; @ObfuscatedName("pt") @ObfuscatedGetter( @@ -511,19 +450,16 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Lbt;" ) - @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("oe") @ObfuscatedGetter( intValue = -1163412349 ) - @Export("chatCycle") static int chatCycle; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "[Lft;" ) - @Export("collisionMaps") static CollisionMap[] collisionMaps; @ObfuscatedName("ac") static boolean field841; @@ -531,55 +467,44 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 908915111 ) - @Export("worldId") public static int worldId; @ObfuscatedName("bc") @ObfuscatedGetter( intValue = -2146116225 ) - @Export("worldProperties") static int worldProperties; @ObfuscatedName("bj") @ObfuscatedGetter( intValue = -77282259 ) - @Export("gameBuild") static int gameBuild; @ObfuscatedName("bg") - @Export("isMembersWorld") public static boolean isMembersWorld; @ObfuscatedName("br") - @Export("isLowDetail") static boolean isLowDetail; @ObfuscatedName("bu") @ObfuscatedGetter( intValue = -1456761211 ) - @Export("clientType") static int clientType; @ObfuscatedName("ba") - @Export("onMobile") static boolean onMobile; @ObfuscatedName("bm") @ObfuscatedGetter( intValue = 1382758875 ) - @Export("gameState") static int gameState; @ObfuscatedName("cu") - @Export("isLoading") static boolean isLoading; @ObfuscatedName("cw") @ObfuscatedGetter( intValue = -925075011 ) - @Export("cycle") static int cycle; @ObfuscatedName("cq") @ObfuscatedGetter( longValue = -6291898819943529903L ) - @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; @ObfuscatedName("cf") @ObfuscatedGetter( @@ -597,88 +522,73 @@ public final class Client extends GameShell implements Usernamed { ) static long field687; @ObfuscatedName("cx") - @Export("hadFocus") static boolean hadFocus; @ObfuscatedName("cp") - @Export("displayFps") static boolean displayFps; @ObfuscatedName("ch") @ObfuscatedGetter( intValue = 1440208899 ) - @Export("rebootTimer") static int rebootTimer; @ObfuscatedName("cs") @ObfuscatedGetter( intValue = -1549228635 ) - @Export("hintArrowType") static int hintArrowType; @ObfuscatedName("ck") @ObfuscatedGetter( intValue = 748257717 ) - @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; @ObfuscatedName("co") @ObfuscatedGetter( intValue = 1282268129 ) - @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; @ObfuscatedName("cz") @ObfuscatedGetter( intValue = 1561023113 ) - @Export("hintArrowX") static int hintArrowX; @ObfuscatedName("cy") @ObfuscatedGetter( intValue = 4072295 ) - @Export("hintArrowY") static int hintArrowY; @ObfuscatedName("cb") @ObfuscatedGetter( intValue = -1130712819 ) - @Export("hintArrowHeight") static int hintArrowHeight; @ObfuscatedName("cl") @ObfuscatedGetter( intValue = 573846843 ) - @Export("hintArrowSubX") static int hintArrowSubX; @ObfuscatedName("dx") @ObfuscatedGetter( intValue = -1575899159 ) - @Export("hintArrowSubY") static int hintArrowSubY; @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "Lcd;" ) - @Export("playerAttackOption") static AttackOption playerAttackOption; @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "Lcd;" ) - @Export("npcAttackOption") static AttackOption npcAttackOption; @ObfuscatedName("db") @ObfuscatedGetter( intValue = -1866562123 ) - @Export("titleLoadingStage") static int titleLoadingStage; @ObfuscatedName("de") @ObfuscatedGetter( intValue = -1673766287 ) - @Export("js5ConnectState") static int js5ConnectState; @ObfuscatedName("da") @ObfuscatedGetter( @@ -689,19 +599,16 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive1") static Archive archive1; @ObfuscatedName("ek") @ObfuscatedGetter( intValue = -55276913 ) - @Export("js5Errors") static int js5Errors; @ObfuscatedName("ep") @ObfuscatedGetter( intValue = -789394093 ) - @Export("loginState") static int loginState; @ObfuscatedName("eg") @ObfuscatedGetter( @@ -727,34 +634,27 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -764965423 ) - @Export("port1") static int port1; @ObfuscatedName("ex") - @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; @ObfuscatedName("ed") @ObfuscatedSignature( descriptor = "Lcs;" ) - @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; @ObfuscatedName("fq") - @Export("randomDatData") static byte[] randomDatData; @ObfuscatedName("fs") @ObfuscatedSignature( descriptor = "[Lcw;" ) - @Export("npcs") static NPC[] npcs; @ObfuscatedName("fv") @ObfuscatedGetter( intValue = 1098794217 ) - @Export("npcCount") static int npcCount; @ObfuscatedName("fz") - @Export("npcIndices") static int[] npcIndices; @ObfuscatedName("fk") @ObfuscatedGetter( @@ -767,27 +667,22 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "Ldx;" ) - @Export("packetWriter") public static final PacketWriter packetWriter; @ObfuscatedName("ff") @ObfuscatedGetter( intValue = 1553785571 ) - @Export("logoutTimer") static int logoutTimer; @ObfuscatedName("fr") static boolean field713; @ObfuscatedName("fi") - @Export("useBufferedSocket") static boolean useBufferedSocket; @ObfuscatedName("fy") @ObfuscatedSignature( descriptor = "Ljz;" ) - @Export("timer") static Timer timer; @ObfuscatedName("fw") - @Export("fontsMap") static HashMap fontsMap; @ObfuscatedName("gj") @ObfuscatedGetter( @@ -815,10 +710,8 @@ public final class Client extends GameShell implements Usernamed { ) static int field732; @ObfuscatedName("gp") - @Export("isInInstance") static boolean isInInstance; @ObfuscatedName("gt") - @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; @ObfuscatedName("gn") static final int[] field736; @@ -831,7 +724,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("headIconPrayerSprites") static Sprite[] headIconPrayerSprites; @ObfuscatedName("hh") @ObfuscatedGetter( @@ -859,55 +751,46 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -977399091 ) - @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; @ObfuscatedName("hs") @ObfuscatedGetter( intValue = -1443068431 ) - @Export("camAngleX") static int camAngleX; @ObfuscatedName("hr") @ObfuscatedGetter( intValue = -711285885 ) - @Export("camAngleY") static int camAngleY; @ObfuscatedName("hl") @ObfuscatedGetter( intValue = 1183878553 ) - @Export("camAngleDY") static int camAngleDY; @ObfuscatedName("hd") @ObfuscatedGetter( intValue = -1283166721 ) - @Export("camAngleDX") static int camAngleDX; @ObfuscatedName("hm") @ObfuscatedGetter( intValue = -759899857 ) - @Export("mouseCamClickedX") static int mouseCamClickedX; @ObfuscatedName("hw") @ObfuscatedGetter( intValue = -1838293597 ) - @Export("mouseCamClickedY") static int mouseCamClickedY; @ObfuscatedName("hy") @ObfuscatedGetter( intValue = 170315783 ) - @Export("oculusOrbState") static int oculusOrbState; @ObfuscatedName("ia") @ObfuscatedGetter( intValue = -1104542973 ) - @Export("camFollowHeight") static int camFollowHeight; @ObfuscatedName("is") @ObfuscatedGetter( @@ -928,13 +811,11 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 1271248647 ) - @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; @ObfuscatedName("iw") @ObfuscatedGetter( intValue = -883817203 ) - @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; @ObfuscatedName("ii") @ObfuscatedGetter( @@ -944,7 +825,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("id") static boolean field759; @ObfuscatedName("it") - @Export("selectedItemName") static String selectedItemName; @ObfuscatedName("iq") @ObfuscatedGetter( @@ -962,85 +842,66 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 997551691 ) - @Export("overheadTextCount") static int overheadTextCount; @ObfuscatedName("ih") @ObfuscatedGetter( intValue = -1325247089 ) - @Export("overheadTextLimit") static int overheadTextLimit; @ObfuscatedName("iu") - @Export("overheadTextXs") static int[] overheadTextXs; @ObfuscatedName("ie") - @Export("overheadTextYs") static int[] overheadTextYs; @ObfuscatedName("ir") - @Export("overheadTextAscents") static int[] overheadTextAscents; @ObfuscatedName("in") - @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; @ObfuscatedName("iy") - @Export("overheadTextColors") static int[] overheadTextColors; @ObfuscatedName("il") - @Export("overheadTextEffects") static int[] overheadTextEffects; @ObfuscatedName("jj") - @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; @ObfuscatedName("jp") - @Export("overheadText") static String[] overheadText; @ObfuscatedName("jd") - @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; @ObfuscatedName("jg") @ObfuscatedGetter( intValue = -383835205 ) - @Export("viewportDrawCount") static int viewportDrawCount; @ObfuscatedName("jq") @ObfuscatedGetter( intValue = -22531197 ) - @Export("viewportTempX") static int viewportTempX; @ObfuscatedName("ju") @ObfuscatedGetter( intValue = -1575851953 ) - @Export("viewportTempY") static int viewportTempY; @ObfuscatedName("jx") @ObfuscatedGetter( intValue = -693132223 ) - @Export("mouseCrossX") static int mouseCrossX; @ObfuscatedName("jt") @ObfuscatedGetter( intValue = 1819425115 ) - @Export("mouseCrossY") static int mouseCrossY; @ObfuscatedName("jm") @ObfuscatedGetter( intValue = -1679326135 ) - @Export("mouseCrossState") static int mouseCrossState; @ObfuscatedName("jl") @ObfuscatedGetter( intValue = -1707383795 ) - @Export("mouseCrossColor") static int mouseCrossColor; @ObfuscatedName("jv") - @Export("showMouseCross") static boolean showMouseCross; @ObfuscatedName("jb") @ObfuscatedGetter( @@ -1056,25 +917,21 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = 526374909 ) - @Export("dragItemSlotSource") static int dragItemSlotSource; @ObfuscatedName("jr") @ObfuscatedGetter( intValue = -1126513777 ) - @Export("draggedWidgetX") static int draggedWidgetX; @ObfuscatedName("ja") @ObfuscatedGetter( intValue = -1580012453 ) - @Export("draggedWidgetY") static int draggedWidgetY; @ObfuscatedName("jk") @ObfuscatedGetter( intValue = -1831513887 ) - @Export("dragItemSlotDestination") static int dragItemSlotDestination; @ObfuscatedName("jy") static boolean field788; @@ -1082,7 +939,6 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1995966425 ) - @Export("itemDragDuration") static int itemDragDuration; @ObfuscatedName("jf") @ObfuscatedGetter( @@ -1090,19 +946,16 @@ public final class Client extends GameShell implements Usernamed { ) static int field790; @ObfuscatedName("jn") - @Export("showLoadingMessages") static boolean showLoadingMessages; @ObfuscatedName("ka") @ObfuscatedSignature( descriptor = "[Lbf;" ) - @Export("players") static Player[] players; @ObfuscatedName("ko") @ObfuscatedGetter( intValue = -1852431749 ) - @Export("localPlayerIndex") static int localPlayerIndex; @ObfuscatedName("kp") @ObfuscatedGetter( @@ -1110,13 +963,11 @@ public final class Client extends GameShell implements Usernamed { ) static int field888; @ObfuscatedName("kw") - @Export("renderSelf") static boolean renderSelf; @ObfuscatedName("kh") @ObfuscatedGetter( intValue = -1302257309 ) - @Export("drawPlayerNames") static int drawPlayerNames; @ObfuscatedName("kt") @ObfuscatedGetter( @@ -1126,121 +977,92 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedName("ks") static int[] field930; @ObfuscatedName("kd") - @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; @ObfuscatedName("kz") - @Export("playerMenuActions") static String[] playerMenuActions; @ObfuscatedName("kl") - @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; @ObfuscatedName("kv") - @Export("defaultRotations") static int[] defaultRotations; @ObfuscatedName("kr") @ObfuscatedGetter( intValue = 1152347413 ) - @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; @ObfuscatedName("kj") @ObfuscatedSignature( descriptor = "[[[Lji;" ) - @Export("groundItems") static NodeDeque[][][] groundItems; @ObfuscatedName("ki") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("pendingSpawns") static NodeDeque pendingSpawns; @ObfuscatedName("kq") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("projectiles") static NodeDeque projectiles; @ObfuscatedName("ky") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("graphicsObjects") static NodeDeque graphicsObjects; @ObfuscatedName("kf") - @Export("currentLevels") static int[] currentLevels; @ObfuscatedName("kn") - @Export("levels") static int[] levels; @ObfuscatedName("kg") - @Export("experience") static int[] experience; @ObfuscatedName("li") @ObfuscatedGetter( intValue = -475626583 ) - @Export("leftClickOpensMenu") static int leftClickOpensMenu; @ObfuscatedName("ll") - @Export("isMenuOpen") static boolean isMenuOpen; @ObfuscatedName("lk") @ObfuscatedGetter( intValue = 366838629 ) - @Export("menuY") static int menuY; @ObfuscatedName("ld") @ObfuscatedGetter( intValue = 1781251597 ) - @Export("menuOptionsCount") static int menuOptionsCount; @ObfuscatedName("la") - @Export("menuArguments1") static int[] menuArguments1; @ObfuscatedName("lb") - @Export("menuArguments2") static int[] menuArguments2; @ObfuscatedName("ly") - @Export("menuOpcodes") static int[] menuOpcodes; @ObfuscatedName("lt") - @Export("menuIdentifiers") static int[] menuIdentifiers; @ObfuscatedName("lg") - @Export("menuActions") static String[] menuActions; @ObfuscatedName("lq") - @Export("menuTargets") static String[] menuTargets; @ObfuscatedName("lo") - @Export("menuShiftClick") static boolean[] menuShiftClick; @ObfuscatedName("lc") - @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; @ObfuscatedName("lu") - @Export("shiftClickDrop") static boolean shiftClickDrop; @ObfuscatedName("lv") - @Export("tapToDrop") static boolean tapToDrop; @ObfuscatedName("lw") - @Export("showMouseOverText") static boolean showMouseOverText; @ObfuscatedName("lm") @ObfuscatedGetter( intValue = 2121046681 ) - @Export("viewportX") static int viewportX; @ObfuscatedName("ls") @ObfuscatedGetter( intValue = -116000717 ) - @Export("viewportY") static int viewportY; @ObfuscatedName("lh") @ObfuscatedGetter( @@ -1256,16 +1078,13 @@ public final class Client extends GameShell implements Usernamed { @ObfuscatedGetter( intValue = -1061875105 ) - @Export("isItemSelected") static int isItemSelected; @ObfuscatedName("md") - @Export("isSpellSelected") static boolean isSpellSelected; @ObfuscatedName("ma") @ObfuscatedGetter( intValue = -1613408879 ) - @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; @ObfuscatedName("mc") @ObfuscatedGetter( @@ -1273,22 +1092,18 @@ public final class Client extends GameShell implements Usernamed { ) static int field834; @ObfuscatedName("mp") - @Export("selectedSpellActionName") static String selectedSpellActionName; @ObfuscatedName("mu") - @Export("selectedSpellName") static String selectedSpellName; @ObfuscatedName("mi") @ObfuscatedGetter( intValue = -1035655229 ) - @Export("rootInterface") static int rootInterface; @ObfuscatedName("mg") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("interfaceParents") static NodeHashTable interfaceParents; @ObfuscatedName("el") @ObfuscatedSignature( @@ -1583,7 +1398,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "912814062" ) - @Export("resizeGame") protected final void resizeGame() { field890 = PacketWriter.currentTimeMillis() + 500L; // L: 3888 this.resizeJS(); // L: 3889 @@ -1598,7 +1412,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "1974240025" ) - @Export("setUp") protected final void setUp() { class277.method5089(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 784 port1 = gameBuild == 0 ? 43594 : worldId + 40000; // L: 785 @@ -1655,7 +1468,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-720509728" ) - @Export("doCycle") protected final void doCycle() { ++cycle; // L: 828 this.doCycleJs5(); // L: 829 @@ -2158,7 +1970,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(ZB)V", garbageValue = "-63" ) - @Export("draw") protected final void draw(boolean var1) { boolean var2 = Script.method2326(); // L: 1195 if (var2 && field704 && WorldMapManager.pcmPlayer0 != null) { // L: 1196 1197 @@ -2234,7 +2045,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-645621446" ) - @Export("kill0") protected final void kill0() { if (ClientPreferences.varcs.hasUnwrittenChanges()) { // L: 1242 ClientPreferences.varcs.write(); @@ -2395,7 +2205,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "858164113" ) - @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { // L: 1315 boolean var1 = BoundaryObject.method3384(); // L: 1316 @@ -2411,7 +2220,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-32277298" ) - @Export("doCycleJs5Connect") void doCycleJs5Connect() { if (NetCache.NetCache_crcMismatches >= 4) { // L: 1321 this.error("js5crc"); // L: 1322 @@ -2496,7 +2304,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(II)V", garbageValue = "1255510114" ) - @Export("js5Error") void js5Error(int var1) { UserComparator7.js5SocketTask = null; // L: 1394 ItemContainer.js5Socket = null; // L: 1395 @@ -2534,7 +2341,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-407945770" ) - @Export("doCycleLoggedOut") final void doCycleLoggedOut() { Object var1 = packetWriter.getSocket(); // L: 1853 PacketBuffer var2 = packetWriter.packetBuffer; // L: 1854 @@ -3162,7 +2968,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-634429203" ) - @Export("doCycleLoggedIn") final void doCycleLoggedIn() { if (rebootTimer > 1) { // L: 2614 --rebootTimer; @@ -3991,7 +3796,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-415953705" ) - @Export("resizeJS") void resizeJS() { int var1 = FloorDecoration.canvasWidth; // L: 3894 int var2 = GameShell.canvasHeight; // L: 3895 @@ -4017,7 +3821,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "-1826762039" ) - @Export("drawLoggedIn") final void drawLoggedIn() { if (rootInterface != -1) { // L: 3907 class58.method913(rootInterface); @@ -5472,7 +5275,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)V", garbageValue = "736639709" ) - @Export("menu") final void menu() { boolean var1 = false; // L: 7056 @@ -5634,7 +5436,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)Z", garbageValue = "-40940345" ) - @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { int var1 = GrandExchangeOffer.method209(); // L: 7176 boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 7177 @@ -5666,7 +5467,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(III)V", garbageValue = "-756667188" ) - @Export("openMenu") final void openMenu(int var1, int var2) { WorldMapSprite.method493(var1, var2); // L: 7199 ScriptEvent.scene.menuOpen(Huffman.Client_plane, var1, var2, false); // L: 7200 @@ -5678,7 +5478,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(ZB)V", garbageValue = "56" ) - @Export("resizeRoot") final void resizeRoot(boolean var1) { int var2 = rootInterface; // L: 9185 int var3 = FloorDecoration.canvasWidth; // L: 9186 @@ -5694,7 +5493,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(Lhq;I)V", garbageValue = "1722928474" ) - @Export("alignWidget") void alignWidget(Widget var1) { Widget var2 = var1.parentId == -1 ? null : TileItem.getWidget(var1.parentId); // L: 9195 int var3; @@ -5803,7 +5601,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(I)Lku;", garbageValue = "1348007061" ) - @Export("username") public Username username() { return WorldMapLabelSize.localPlayer != null ? WorldMapLabelSize.localPlayer.username : null; // L: 10858 } @@ -5853,7 +5650,6 @@ public final class Client extends GameShell implements Usernamed { descriptor = "(Lgf;Llh;I)Lgb;", garbageValue = "-1510216701" ) - @Export("getPacketBufferNode") public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { PacketBufferNode var2 = ItemContainer.method1226(); // L: 27 var2.clientPacket = var0; // L: 28 diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 6332b528ba..670c8c8e4a 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -516,13 +515,11 @@ public class ClientPacket implements class190 { @ObfuscatedGetter( intValue = -1495788607 ) - @Export("id") final int id; @ObfuscatedName("cb") @ObfuscatedGetter( intValue = -1365749519 ) - @Export("length") final int length; static { @@ -671,7 +668,6 @@ public class ClientPacket implements class190 { descriptor = "(IIB)V", garbageValue = "-100" ) - @Export("runIntfCloseListeners") static final void runIntfCloseListeners(int var0, int var1) { if (WorldMapSprite.loadInterface(var0)) { // L: 10110 WorldMapAreaData.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10111 diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 59e12bcb5e..9be0c97cfa 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,7 +1,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,40 +13,31 @@ public class ClientPreferences { @ObfuscatedSignature( descriptor = "Lco;" ) - @Export("varcs") static Varcs varcs; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1940309873 ) - @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("title_muteSprite") static IndexedSprite[] title_muteSprite; @ObfuscatedName("s") - @Export("roofsHidden") boolean roofsHidden; @ObfuscatedName("t") - @Export("titleMusicDisabled") boolean titleMusicDisabled; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1674568027 ) - @Export("windowMode") int windowMode; @ObfuscatedName("o") - @Export("rememberedUsername") String rememberedUsername; @ObfuscatedName("x") - @Export("hideUsername") boolean hideUsername; @ObfuscatedName("w") - @Export("parameters") LinkedHashMap parameters; static { @@ -124,7 +114,6 @@ public class ClientPreferences { descriptor = "(I)Lkf;", garbageValue = "1981106247" ) - @Export("toBuffer") Buffer toBuffer() { Buffer var1 = new Buffer(100); // L: 62 var1.writeByte(ClientPreferences_optionCount); // L: 63 diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 1896645921..2070dae063 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -14,7 +13,6 @@ public abstract class Clock { descriptor = "(I)V", garbageValue = "208275261" ) - @Export("mark") public abstract void mark(); @ObfuscatedName("k") @@ -22,7 +20,6 @@ public abstract class Clock { descriptor = "(III)I", garbageValue = "-16016139" ) - @Export("wait") public abstract int wait(int var1, int var2); @ObfuscatedName("ik") @@ -30,7 +27,6 @@ public abstract class Clock { descriptor = "(IIIIIB)V", garbageValue = "24" ) - @Export("drawScrollBar") static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { GrandExchangeEvent.scrollBarSprites[0].drawAt(var0, var1); // L: 9309 GrandExchangeEvent.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 9310 @@ -57,7 +53,6 @@ public abstract class Clock { descriptor = "(IB)V", garbageValue = "59" ) - @Export("changeGameOptions") static final void changeGameOptions(int var0) { DevicePcmPlayerProvider.method897(); // L: 10348 diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 4148086296..3d198fab6c 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,34 +10,28 @@ public class CollisionMap { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive6") static Archive archive6; @ObfuscatedName("au") @ObfuscatedGetter( intValue = 232599941 ) - @Export("xInset") int xInset; @ObfuscatedName("aa") @ObfuscatedGetter( intValue = -2100158867 ) - @Export("yInset") int yInset; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = -393101507 ) - @Export("xSize") int xSize; @ObfuscatedName("at") @ObfuscatedGetter( intValue = -2096335191 ) - @Export("ySize") int ySize; @ObfuscatedName("aq") - @Export("flags") public int[][] flags; public CollisionMap(int var1, int var2) { @@ -55,7 +48,6 @@ public class CollisionMap { descriptor = "(I)V", garbageValue = "-1749898511" ) - @Export("clear") public void clear() { for (int var1 = 0; var1 < this.xSize; ++var1) { // L: 53 for (int var2 = 0; var2 < this.ySize; ++var2) { // L: 54 @@ -226,7 +218,6 @@ public class CollisionMap { descriptor = "(IIIIZI)V", garbageValue = "-1934730516" ) - @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { int var6 = 256; // L: 185 if (var5) { // L: 186 @@ -253,7 +244,6 @@ public class CollisionMap { descriptor = "(III)V", garbageValue = "1924690823" ) - @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { var1 -= this.xInset; // L: 199 var2 -= this.yInset; // L: 200 @@ -266,7 +256,6 @@ public class CollisionMap { descriptor = "(III)V", garbageValue = "1474053794" ) - @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { var1 -= this.xInset; // L: 205 var2 -= this.yInset; // L: 206 @@ -279,7 +268,6 @@ public class CollisionMap { descriptor = "(IIIB)V", garbageValue = "88" ) - @Export("setFlag") void setFlag(int var1, int var2, int var3) { int[] var10000 = this.flags[var1]; // L: 211 var10000[var2] |= var3; @@ -442,7 +430,6 @@ public class CollisionMap { descriptor = "(IIIIIZI)V", garbageValue = "65280" ) - @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { int var7 = 256; // L: 338 if (var6) { // L: 339 @@ -475,7 +462,6 @@ public class CollisionMap { descriptor = "(IIII)V", garbageValue = "-1445892610" ) - @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { int[] var10000 = this.flags[var1]; // L: 357 var10000[var2] &= ~var3; @@ -507,7 +493,6 @@ public class CollisionMap { descriptor = "(II)V", garbageValue = "1831550493" ) - @Export("updateGameState") static void updateGameState(int var0) { if (var0 != Client.gameState) { // L: 1279 if (Client.gameState == 0) { // L: 1280 @@ -558,7 +543,6 @@ public class CollisionMap { descriptor = "(Lcg;II)V", garbageValue = "1018652463" ) - @Export("updateActorSequence") static final void updateActorSequence(Actor var0, int var1) { SequenceDefinition var2; int var3; @@ -929,7 +913,6 @@ public class CollisionMap { descriptor = "(ZI)V", garbageValue = "-1510761090" ) - @Export("addNpcsToScene") static final void addNpcsToScene(boolean var0) { for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4289 NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4290 diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 7ecf9b15c7..034dfa8e5d 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,19 +10,16 @@ public class Coord { @ObfuscatedGetter( intValue = -877871317 ) - @Export("plane") public int plane; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1594066417 ) - @Export("x") public int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1889586591 ) - @Export("y") public int y; @ObfuscatedSignature( @@ -57,7 +53,6 @@ public class Coord { descriptor = "(B)I", garbageValue = "-78" ) - @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; // L: 30 } @@ -67,7 +62,6 @@ public class Coord { descriptor = "(Lhg;I)Z", garbageValue = "24386397" ) - @Export("equalsCoord") boolean equalsCoord(Coord var1) { if (this.plane != var1.plane) { // L: 40 return false; @@ -83,7 +77,6 @@ public class Coord { descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", garbageValue = "0" ) - @Export("toString") String toString(String var1) { return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 55 } @@ -161,7 +154,6 @@ public class Coord { descriptor = "(IIIILlp;Lhz;I)V", garbageValue = "-334370993" ) - @Export("worldToMinimap") static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { int var6 = var3 * var3 + var2 * var2; // L: 10644 if (var6 > 4225 && var6 < 90000) { // L: 10645 diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index a7e857611c..b55ef59a39 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,7 +4,6 @@ import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -22,16 +21,13 @@ public class Decimator { @ObfuscatedGetter( intValue = -1300343433 ) - @Export("inputRate") int inputRate; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1507874041 ) - @Export("outputRate") int outputRate; @ObfuscatedName("o") - @Export("table") int[][] table; public Decimator(int var1, int var2) { @@ -88,7 +84,6 @@ public class Decimator { descriptor = "([BB)[B", garbageValue = "-47" ) - @Export("resample") byte[] resample(byte[] var1) { if (this.table != null) { int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; @@ -134,7 +129,6 @@ public class Decimator { descriptor = "(IB)I", garbageValue = "0" ) - @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); @@ -148,7 +142,6 @@ public class Decimator { descriptor = "(II)I", garbageValue = "-1133574944" ) - @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; @@ -162,7 +155,6 @@ public class Decimator { descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", garbageValue = "0" ) - @Export("RunException_sendStackTrace") public static void RunException_sendStackTrace(String var0, Throwable var1) { if (var1 != null) { var1.printStackTrace(); @@ -252,7 +244,6 @@ public class Decimator { descriptor = "(I)Lct;", garbageValue = "-1387826100" ) - @Export("worldListStart") static World worldListStart() { World.World_listCount = 0; // L: 237 return WorldMapEvent.getNextWorldListWorld(); // L: 238 @@ -263,7 +254,6 @@ public class Decimator { descriptor = "(Ljava/lang/String;B)I", garbageValue = "-65" ) - @Export("stringCp1252NullTerminatedByteSize") public static int stringCp1252NullTerminatedByteSize(String var0) { return var0.length() + 1; // L: 119 } @@ -273,7 +263,6 @@ public class Decimator { descriptor = "([Lhq;IIIIIIIII)V", garbageValue = "1194287146" ) - @Export("drawInterface") static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8669 Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 8670 diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 3670ee3c75..c8d3a7d8cb 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,7 +15,6 @@ public class DefaultsGroup { @ObfuscatedGetter( intValue = -116036803 ) - @Export("group") final int group; static { diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 635abb82ca..cdac50a5ee 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,22 +6,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("DemotingHashTable") public final class DemotingHashTable { @ObfuscatedName("z") - @Export("capacity") int capacity; @ObfuscatedName("k") - @Export("remaining") int remaining; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("hashTable") IterableNodeHashTable hashTable; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Ljh;" ) - @Export("queue") IterableDualNodeQueue queue; @ObfuscatedName("i") @ObfuscatedSignature( @@ -43,7 +38,6 @@ public final class DemotingHashTable { } // L: 20 @ObfuscatedName("z") - @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 23 if (var3 == null) { // L: 24 @@ -74,7 +68,6 @@ public final class DemotingHashTable { } @ObfuscatedName("k") - @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 48 this.removeWrapper(var3); // L: 49 @@ -84,7 +77,6 @@ public final class DemotingHashTable { @ObfuscatedSignature( descriptor = "(Lfx;)V" ) - @Export("removeWrapper") void removeWrapper(Wrapper var1) { if (var1 != null) { // L: 53 var1.remove(); // L: 54 @@ -95,7 +87,6 @@ public final class DemotingHashTable { } // L: 58 @ObfuscatedName("t") - @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { // L: 61 throw new IllegalStateException(); @@ -126,7 +117,6 @@ public final class DemotingHashTable { } // L: 79 @ObfuscatedName("i") - @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 82 if (var2.isSoft()) { // L: 83 @@ -147,7 +137,6 @@ public final class DemotingHashTable { } // L: 101 @ObfuscatedName("o") - @Export("clear") public void clear() { this.queue.clear(); // L: 104 this.hashTable.clear(); // L: 105 diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 9f7492303b..2cdd5380f7 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -28,7 +27,6 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { descriptor = "(I)Lmr;", garbageValue = "-1896317364" ) - @Export("get") public PlatformInfo get() { byte var1; if (JagexCache.field2094.startsWith("win")) { // L: 15 diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index a592561653..c40fc6e4bf 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -3,7 +3,6 @@ import javax.sound.sampled.AudioSystem; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.DataLine.Info; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,19 +12,15 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { @ObfuscatedName("z") - @Export("format") AudioFormat format; @ObfuscatedName("k") - @Export("line") SourceDataLine line; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -636994811 ) - @Export("capacity2") int capacity2; @ObfuscatedName("t") - @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { @@ -36,7 +31,6 @@ public class DevicePcmPlayer extends PcmPlayer { descriptor = "(I)V", garbageValue = "-841767260" ) - @Export("init") protected void init() { this.format = new AudioFormat((float)PcmPlayer.field1447, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 @@ -47,7 +41,6 @@ public class DevicePcmPlayer extends PcmPlayer { descriptor = "(IB)V", garbageValue = "-120" ) - @Export("open") protected void open(int var1) throws LineUnavailableException { try { Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 @@ -70,13 +63,11 @@ public class DevicePcmPlayer extends PcmPlayer { descriptor = "(B)I", garbageValue = "106" ) - @Export("position") protected int position() { return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 } @ObfuscatedName("t") - @Export("write") protected void write() { int var1 = 256; // L: 49 if (PcmPlayer.PcmPlayer_stereo) { // L: 50 @@ -101,7 +92,6 @@ public class DevicePcmPlayer extends PcmPlayer { descriptor = "(I)V", garbageValue = "667465439" ) - @Export("close") protected void close() { if (this.line != null) { // L: 63 this.line.close(); // L: 64 @@ -115,7 +105,6 @@ public class DevicePcmPlayer extends PcmPlayer { descriptor = "(I)V", garbageValue = "-2027971398" ) - @Export("discard") protected void discard() { this.line.flush(); // L: 70 } // L: 71 diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 3b188d5b29..702c56872a 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,13 +10,11 @@ public class DevicePcmPlayerProvider implements PlayerProvider { @ObfuscatedSignature( descriptor = "Lkl;" ) - @Export("WorldMapElement_fonts") static Fonts WorldMapElement_fonts; @ObfuscatedName("lf") @ObfuscatedGetter( intValue = 1325063249 ) - @Export("menuWidth") static int menuWidth; DevicePcmPlayerProvider() { @@ -28,7 +25,6 @@ public class DevicePcmPlayerProvider implements PlayerProvider { descriptor = "(I)Ldr;", garbageValue = "-1032997343" ) - @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); // L: 10 } @@ -38,7 +34,6 @@ public class DevicePcmPlayerProvider implements PlayerProvider { descriptor = "(IB)I", garbageValue = "1" ) - @Export("iLog") public static int iLog(int var0) { int var1 = 0; // L: 54 if (var0 < 0 || var0 >= 65536) { // L: 55 @@ -74,7 +69,6 @@ public class DevicePcmPlayerProvider implements PlayerProvider { descriptor = "([BI)[B", garbageValue = "-2036549161" ) - @Export("decompressBytes") static final byte[] decompressBytes(byte[] var0) { Buffer var1 = new Buffer(var0); // L: 363 int var2 = var1.readUnsignedByte(); // L: 364 diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index a89d0c0a66..32cb6592a9 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,5 +1,4 @@ import java.nio.ByteBuffer; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,7 +10,6 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; @ObfuscatedName("bz") @ObfuscatedSignature( @@ -19,7 +17,6 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { ) static GameBuild field2525; @ObfuscatedName("z") - @Export("directBuffer") ByteBuffer directBuffer; DirectByteArrayCopier() { @@ -30,7 +27,6 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { descriptor = "(I)[B", garbageValue = "-1021172953" ) - @Export("get") byte[] get() { byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 this.directBuffer.position(0); // L: 14 @@ -43,7 +39,6 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { descriptor = "([BI)V", garbageValue = "-1366071744" ) - @Export("set") void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 this.directBuffer.position(0); // L: 21 @@ -55,7 +50,6 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { descriptor = "(Lhq;IIB)V", garbageValue = "47" ) - @Export("alignWidgetPosition") static void alignWidgetPosition(Widget var0, int var1, int var2) { if (var0.xAlignment == 0) { // L: 9262 var0.x = var0.rawX; diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 3b30b17547..2f01802525 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,7 +5,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { @ObfuscatedName("z") - @Export("obj") Object obj; DirectWrapper(Object var1, int var2) { @@ -15,13 +13,11 @@ public class DirectWrapper extends Wrapper { } // L: 9 @ObfuscatedName("z") - @Export("get") Object get() { return this.obj; // L: 12 } @ObfuscatedName("k") - @Export("isSoft") boolean isSoft() { return false; // L: 16 } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 9f720a43a9..517ab89e02 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,23 +6,19 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("DualNode") public class DualNode extends Node { @ObfuscatedName("cj") - @Export("keyDual") public long keyDual; @ObfuscatedName("cd") @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("previousDual") public DualNode previousDual; @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("nextDual") public DualNode nextDual; @ObfuscatedName("dq") - @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 this.nextDual.previousDual = this.previousDual; // L: 10 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 67c7ad8d66..30266b18d6 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,7 +9,6 @@ public final class DualNodeDeque { @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("sentinel") DualNode sentinel; public DualNodeDeque() { @@ -23,7 +21,6 @@ public final class DualNodeDeque { @ObfuscatedSignature( descriptor = "(Lgs;)V" ) - @Export("addFirst") public void addFirst(DualNode var1) { if (var1.nextDual != null) { // L: 14 var1.removeDual(); @@ -39,7 +36,6 @@ public final class DualNodeDeque { @ObfuscatedSignature( descriptor = "(Lgs;)V" ) - @Export("addLast") public void addLast(DualNode var1) { if (var1.nextDual != null) { // L: 22 var1.removeDual(); @@ -55,7 +51,6 @@ public final class DualNodeDeque { @ObfuscatedSignature( descriptor = "()Lgs;" ) - @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; // L: 30 return var1 == this.sentinel ? null : var1; // L: 31 32 diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index efcc25a509..c97436fbcc 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,61 +10,51 @@ public class DynamicObject extends Entity { @ObfuscatedSignature( descriptor = "Lkr;" ) - @Export("fontPlain11") static Font fontPlain11; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -992554479 ) - @Export("id") int id; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -224037215 ) - @Export("type") int type; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1337748479 ) - @Export("orientation") int orientation; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 719138669 ) - @Export("plane") int plane; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1011089507 ) - @Export("x") int x; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1704315949 ) - @Export("y") int y; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Ljm;" ) - @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -791329731 ) - @Export("frame") int frame; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1556832647 ) - @Export("cycleStart") int cycleStart; @ObfuscatedSignature( @@ -104,7 +93,6 @@ public class DynamicObject extends Entity { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected final Model getModel() { if (this.sequenceDefinition != null) { // L: 46 int var1 = Client.cycle - this.cycleStart; // L: 47 @@ -167,7 +155,6 @@ public class DynamicObject extends Entity { descriptor = "(Lkf;IIIIIIB)V", garbageValue = "24" ) - @Export("loadTerrain") static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7; if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 108 @@ -240,7 +227,6 @@ public class DynamicObject extends Entity { } // L: 162 @ObfuscatedName("m") - @Export("addEntityUnderMouse") static final void addEntityUnderMouse(long var0) { ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 99 } // L: 100 diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 380543afd0..4641346406 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,13 +10,11 @@ public abstract class Entity extends DualNode { @ObfuscatedSignature( descriptor = "Lkx;" ) - @Export("clanChat") static ClanChat clanChat; @ObfuscatedName("cf") @ObfuscatedGetter( intValue = -282434447 ) - @Export("height") public int height; protected Entity() { @@ -29,13 +26,11 @@ public abstract class Entity extends DualNode { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected Model getModel() { return null; // L: 19 } @ObfuscatedName("cb") - @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); // L: 11 if (var11 != null) { // L: 12 diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index b32040fd90..e57003ea38 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,43 +10,33 @@ public class EnumDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("EnumDefinition_archive") static AbstractArchive EnumDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; @ObfuscatedName("s") - @Export("inputType") public char inputType; @ObfuscatedName("t") - @Export("outputType") public char outputType; @ObfuscatedName("i") - @Export("defaultStr") public String defaultStr; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1401922337 ) - @Export("defaultInt") public int defaultInt; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1452935225 ) - @Export("outputCount") public int outputCount; @ObfuscatedName("w") - @Export("keys") public int[] keys; @ObfuscatedName("g") - @Export("intVals") public int[] intVals; @ObfuscatedName("m") - @Export("strVals") public String[] strVals; static { @@ -64,7 +53,6 @@ public class EnumDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "-2086226438" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 40 @@ -81,7 +69,6 @@ public class EnumDefinition extends DualNode { descriptor = "(Lkf;IB)V", garbageValue = "57" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 47 this.inputType = (char)var1.readUnsignedByte(); @@ -121,7 +108,6 @@ public class EnumDefinition extends DualNode { descriptor = "(B)I", garbageValue = "1" ) - @Export("size") public int size() { return this.outputCount; // L: 73 } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 1d1a6ce73e..6806c0729f 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,6 +10,5 @@ public interface Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") int rsOrdinal(); } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 079c1fd3ea..59c8525277 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,22 +11,18 @@ public final class EvictingDualNodeHashTable { ) DualNode field1995; @ObfuscatedName("k") - @Export("capacity") int capacity; @ObfuscatedName("s") - @Export("remainingCapacity") int remainingCapacity; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("hashTable") IterableNodeHashTable hashTable; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Ljh;" ) - @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { @@ -47,7 +42,6 @@ public final class EvictingDualNodeHashTable { @ObfuscatedSignature( descriptor = "(J)Lgs;" ) - @Export("get") public DualNode get(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 if (var3 != null) { // L: 24 @@ -58,7 +52,6 @@ public final class EvictingDualNodeHashTable { } @ObfuscatedName("k") - @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 if (var3 != null) { // L: 33 @@ -73,7 +66,6 @@ public final class EvictingDualNodeHashTable { @ObfuscatedSignature( descriptor = "(Lgs;J)V" ) - @Export("put") public void put(DualNode var1, long var2) { if (this.remainingCapacity == 0) { // L: 41 DualNode var4 = this.deque.removeLast(); // L: 42 @@ -93,7 +85,6 @@ public final class EvictingDualNodeHashTable { } // L: 54 @ObfuscatedName("t") - @Export("clear") public void clear() { this.deque.clear(); // L: 57 this.hashTable.clear(); // L: 58 diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 8338749332..e2697e9c8c 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,31 +10,26 @@ public class FaceNormal { @ObfuscatedGetter( intValue = 1856660121 ) - @Export("pcmSampleLength") public static int pcmSampleLength; @ObfuscatedName("ha") @ObfuscatedGetter( intValue = 1637295417 ) - @Export("cameraY") static int cameraY; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -364011515 ) - @Export("x") int x; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1271035903 ) - @Export("y") int y; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1616346001 ) - @Export("z") int z; FaceNormal() { diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 24e45daf19..53b42fe37b 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,6 +1,5 @@ import java.io.File; import java.util.Hashtable; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -15,13 +14,10 @@ public class FileSystem { ) static int field2099; @ObfuscatedName("z") - @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; @ObfuscatedName("k") - @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; @ObfuscatedName("s") - @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; static { @@ -34,7 +30,6 @@ public class FileSystem { descriptor = "(Lky;IB)Z", garbageValue = "1" ) - @Export("updateExternalPlayer") static boolean updateExternalPlayer(PacketBuffer var0, int var1) { int var2 = var0.readBits(2); // L: 368 int var3; diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index 2a5395d601..b454ecb985 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,32 +10,27 @@ public enum FillMode implements Enumerated { @ObfuscatedSignature( descriptor = "Llm;" ) - @Export("SOLID") SOLID(0, 0), @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Llm;" ) - @Export("GRADIENT") GRADIENT(1, 1), @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llm;" ) - @Export("GRADIENT_ALPHA") GRADIENT_ALPHA(2, 2); @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1262740687 ) - @Export("id") public final int id; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1489188623 ) - @Export("index") final int index; FillMode(int var3, int var4) { @@ -49,7 +43,6 @@ public enum FillMode implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.index; // L: 24 } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index a9d420de82..f5c650908e 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,43 +15,36 @@ public final class FloorDecoration { @ObfuscatedGetter( intValue = -339938865 ) - @Export("canvasWidth") public static int canvasWidth; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("entity") public Entity entity; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -894788303 ) - @Export("tileHeight") int tileHeight; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1021856255 ) - @Export("x") int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1156042873 ) - @Export("y") int y; @ObfuscatedName("i") @ObfuscatedGetter( longValue = -1933481833005826137L ) - @Export("tag") public long tag; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -124409527 ) - @Export("flags") int flags; FloorDecoration() { @@ -63,7 +55,6 @@ public final class FloorDecoration { descriptor = "([Lct;II[I[II)V", garbageValue = "1270252584" ) - @Export("sortWorlds") static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { if (var1 < var2) { // L: 81 int var5 = var1 - 1; // L: 82 diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index f080a31f29..650de217e6 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,64 +10,53 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1313207677 ) - @Export("primaryRgb") public int primaryRgb; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1768544221 ) - @Export("texture") public int texture; @ObfuscatedName("i") - @Export("hideUnderlay") public boolean hideUnderlay; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1964387519 ) - @Export("secondaryRgb") public int secondaryRgb; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1954941483 ) - @Export("hue") public int hue; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -935699783 ) - @Export("saturation") public int saturation; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1596036719 ) - @Export("lightness") public int lightness; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 45293449 ) - @Export("secondaryHue") public int secondaryHue; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1367236851 ) - @Export("secondarySaturation") public int secondarySaturation; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1186195215 ) - @Export("secondaryLightness") public int secondaryLightness; static { @@ -87,7 +75,6 @@ public class FloorOverlayDefinition extends DualNode { descriptor = "(I)V", garbageValue = "1294557825" ) - @Export("postDecode") void postDecode() { if (this.secondaryRgb != -1) { // L: 37 this.setHsl(this.secondaryRgb); // L: 38 @@ -104,7 +91,6 @@ public class FloorOverlayDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-1509952388" ) - @Export("decode") void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); // L: 48 @@ -121,7 +107,6 @@ public class FloorOverlayDefinition extends DualNode { descriptor = "(Lkf;III)V", garbageValue = "211427426" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { // L: 55 this.primaryRgb = var1.readMedium(); @@ -141,7 +126,6 @@ public class FloorOverlayDefinition extends DualNode { descriptor = "(II)V", garbageValue = "304322495" ) - @Export("setHsl") void setHsl(int var1) { double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64 double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65 @@ -231,7 +215,6 @@ public class FloorOverlayDefinition extends DualNode { descriptor = "(ZLky;I)V", garbageValue = "2034094426" ) - @Export("updateNpcs") static final void updateNpcs(boolean var0, PacketBuffer var1) { Client.field771 = 0; // L: 6735 Client.field702 = 0; // L: 6736 diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 7ab2b97e17..75d8cd864f 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,43 +10,36 @@ public class FloorUnderlayDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1526550495 ) - @Export("rgb") int rgb; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -196392257 ) - @Export("hue") public int hue; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1341685519 ) - @Export("saturation") public int saturation; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 57935727 ) - @Export("lightness") public int lightness; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1946992829 ) - @Export("hueMultiplier") public int hueMultiplier; static { @@ -63,7 +55,6 @@ public class FloorUnderlayDefinition extends DualNode { descriptor = "(B)V", garbageValue = "-7" ) - @Export("postDecode") public void postDecode() { this.setHsl(this.rgb); // L: 23 } // L: 24 @@ -73,7 +64,6 @@ public class FloorUnderlayDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-1970476156" ) - @Export("decode") public void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); // L: 28 @@ -90,7 +80,6 @@ public class FloorUnderlayDefinition extends DualNode { descriptor = "(Lkf;III)V", garbageValue = "-789345955" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { // L: 35 this.rgb = var1.readMedium(); @@ -103,7 +92,6 @@ public class FloorUnderlayDefinition extends DualNode { descriptor = "(IB)V", garbageValue = "39" ) - @Export("setHsl") void setHsl(int var1) { double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 40 double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 41 diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index ab8604e6b3..d87d60705c 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -14,7 +13,6 @@ public final class Font extends AbstractFont { } // L: 12 @ObfuscatedName("z") - @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 int var8 = Rasterizer2D.Rasterizer2D_width - var4; // L: 16 @@ -56,7 +54,6 @@ public final class Font extends AbstractFont { } // L: 44 @ObfuscatedName("k") - @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; // L: 47 int var9 = Rasterizer2D.Rasterizer2D_width - var4; // L: 48 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index b6bc58c191..f5048bc82f 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,58 +10,48 @@ public class FontName { @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("FontName_plain11") public static final FontName FontName_plain11; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("FontName_plain12") public static final FontName FontName_plain12; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("FontName_bold12") public static final FontName FontName_bold12; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("FontName_verdana11") public static final FontName FontName_verdana11; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("FontName_verdana13") public static final FontName FontName_verdana13; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("FontName_verdana15") public static final FontName FontName_verdana15; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 334630663 ) - @Export("clientTickTimeIdx") static int clientTickTimeIdx; @ObfuscatedName("eo") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive20") static Archive archive20; @ObfuscatedName("gg") @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("redHintArrowSprite") static Sprite redHintArrowSprite; @ObfuscatedName("x") - @Export("name") String name; static { @@ -110,7 +99,6 @@ public class FontName { descriptor = "(II)V", garbageValue = "1773491987" ) - @Export("setWindowedMode") static void setWindowedMode(int var0) { Client.field890 = 0L; // L: 3866 if (var0 >= 2) { // L: 3867 diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index dca658e4a2..1716186f54 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,5 +1,4 @@ import java.util.HashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,16 +10,13 @@ public class Fonts { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("spritesArchive") AbstractArchive spritesArchive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("fontsArchive") AbstractArchive fontsArchive; @ObfuscatedName("s") - @Export("map") HashMap map; @ObfuscatedSignature( @@ -37,7 +33,6 @@ public class Fonts { descriptor = "([Lkz;I)Ljava/util/HashMap;", garbageValue = "376087905" ) - @Export("createMap") public HashMap createMap(FontName[] var1) { HashMap var2 = new HashMap(); // L: 20 FontName[] var3 = var1; // L: 22 diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 2e5083f522..c1101fea6a 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class Frames extends DualNode { @ObfuscatedSignature( descriptor = "Lak;" ) - @Export("worldMapEvent") static WorldMapEvent worldMapEvent; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "[Les;" ) - @Export("frames") Animation[] frames; @ObfuscatedSignature( @@ -62,7 +59,6 @@ public class Frames extends DualNode { descriptor = "(II)Z", garbageValue = "-615268512" ) - @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; // L: 63 } @@ -134,7 +130,6 @@ public class Frames extends DualNode { descriptor = "(II)I", garbageValue = "-500804162" ) - @Export("getEntityIdUnderMouse") public static int getEntityIdUnderMouse(int var0) { return UserComparator9.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72 } @@ -144,7 +139,6 @@ public class Frames extends DualNode { descriptor = "(Ljava/lang/String;I)V", garbageValue = "2077943773" ) - @Export("clanKickUser") static final void clanKickUser(String var0) { if (Entity.clanChat != null) { // L: 10687 PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 10688 diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 25dc48b3e0..2ae3b1e481 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -19,7 +18,6 @@ public class Friend extends Buddy { descriptor = "(Lkc;I)I", garbageValue = "1550059745" ) - @Export("compareToFriend") int compareToFriend(Friend var1) { if (super.world == Client.worldId && Client.worldId != var1.world) { // L: 12 return -1; @@ -47,7 +45,6 @@ public class Friend extends Buddy { descriptor = "(Ljc;I)I", garbageValue = "-243007320" ) - @Export("compareTo_user") public int compareTo_user(User var1) { return this.compareToFriend((Friend)var1); // L: 29 } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 8154cd8ccc..af8234de99 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,10 +15,8 @@ public class FriendLoginUpdate extends Link { @ObfuscatedSignature( descriptor = "Lku;" ) - @Export("username") public Username username; @ObfuscatedName("i") - @Export("world") public short world; @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index c7a4444652..7b5b51005b 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,19 +10,16 @@ public class FriendSystem { @ObfuscatedSignature( descriptor = "Lmu;" ) - @Export("loginType") final LoginType loginType; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lkw;" ) - @Export("friendsList") public final FriendsList friendsList; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Ljs;" ) - @Export("ignoreList") public final IgnoreList ignoreList; @ObfuscatedName("x") @ObfuscatedGetter( @@ -64,7 +60,6 @@ public class FriendSystem { descriptor = "(Lkf;IS)V", garbageValue = "-279" ) - @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 this.field1099 = 2; // L: 41 @@ -86,7 +81,6 @@ public class FriendSystem { descriptor = "(I)V", garbageValue = "1616251932" ) - @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55 if ((long)var1.field3664 < PacketWriter.currentTimeMillis() / 1000L - 5L) { // L: 56 @@ -109,7 +103,6 @@ public class FriendSystem { descriptor = "(I)V", garbageValue = "16776960" ) - @Export("clear") final void clear() { this.field1099 = 0; // L: 65 this.friendsList.clear(); // L: 66 @@ -121,7 +114,6 @@ public class FriendSystem { descriptor = "(Lku;ZB)Z", garbageValue = "6" ) - @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { // L: 71 return false; @@ -137,7 +129,6 @@ public class FriendSystem { descriptor = "(Lku;B)Z", garbageValue = "-12" ) - @Export("isIgnored") final boolean isIgnored(Username var1) { if (var1 == null) { // L: 78 return false; @@ -151,7 +142,6 @@ public class FriendSystem { descriptor = "(Ljava/lang/String;I)V", garbageValue = "597249959" ) - @Export("addFriend") final void addFriend(String var1) { if (var1 != null) { // L: 84 Username var2 = new Username(var1, this.loginType); // L: 85 @@ -178,7 +168,6 @@ public class FriendSystem { descriptor = "(S)Z", garbageValue = "-12193" ) - @Export("friendsListIsFull") final boolean friendsListIsFull() { return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field888 != 1; // L: 141 } @@ -188,7 +177,6 @@ public class FriendSystem { descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1984933223" ) - @Export("addIgnore") final void addIgnore(String var1) { if (var1 != null) { // L: 148 Username var2 = new Username(var1, this.loginType); // L: 149 @@ -233,7 +221,6 @@ public class FriendSystem { descriptor = "(B)Z", garbageValue = "61" ) - @Export("canAddIgnore") final boolean canAddIgnore() { return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field888 != 1; // L: 197 } @@ -243,7 +230,6 @@ public class FriendSystem { descriptor = "(Ljava/lang/String;I)V", garbageValue = "-1937520523" ) - @Export("removeFriend") final void removeFriend(String var1) { if (var1 != null) { // L: 204 Username var2 = new Username(var1, this.loginType); // L: 205 @@ -275,7 +261,6 @@ public class FriendSystem { descriptor = "(Ljava/lang/String;I)V", garbageValue = "1683783285" ) - @Export("removeIgnore") final void removeIgnore(String var1) { if (var1 != null) { // L: 230 Username var2 = new Username(var1, this.loginType); // L: 231 @@ -298,7 +283,6 @@ public class FriendSystem { descriptor = "(Lku;I)Z", garbageValue = "-1919732460" ) - @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 256 return var2 != null && var2.hasWorld(); // L: 257 @@ -309,7 +293,6 @@ public class FriendSystem { descriptor = "(II)Lie;", garbageValue = "-2171031" ) - @Export("KitDefinition_get") public static KitDefinition KitDefinition_get(int var0) { KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33 if (var1 != null) { // L: 34 diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 915d771324..a822e7b343 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class FriendsList extends UserList { @ObfuscatedSignature( descriptor = "Lmu;" ) - @Export("loginType") final LoginType loginType; @ObfuscatedName("m") @ObfuscatedGetter( @@ -22,7 +20,6 @@ public class FriendsList extends UserList { @ObfuscatedSignature( descriptor = "Ljb;" ) - @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( @@ -40,7 +37,6 @@ public class FriendsList extends UserList { descriptor = "(B)Ljc;", garbageValue = "35" ) - @Export("newInstance") User newInstance() { return new Friend(); // L: 22 } @@ -50,7 +46,6 @@ public class FriendsList extends UserList { descriptor = "(IB)[Ljc;", garbageValue = "-19" ) - @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; // L: 26 } @@ -60,7 +55,6 @@ public class FriendsList extends UserList { descriptor = "(Lku;ZI)Z", garbageValue = "-1059654626" ) - @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { Friend var3 = (Friend)this.getByUsername(var1); // L: 30 if (var3 == null) { @@ -75,7 +69,6 @@ public class FriendsList extends UserList { descriptor = "(Lkf;II)V", garbageValue = "-233603151" ) - @Export("read") public void read(Buffer var1, int var2) { while (true) { if (var1.offset < var2) { // L: 37 diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index a166bf9adc..d852540f3b 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,5 +1,4 @@ import java.util.zip.Inflater; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,10 +11,8 @@ public class GZipDecompressor { @ObfuscatedGetter( intValue = -198974001 ) - @Export("idxCount") public static int idxCount; @ObfuscatedName("z") - @Export("inflater") Inflater inflater; @ObfuscatedSignature( @@ -34,7 +31,6 @@ public class GZipDecompressor { descriptor = "(Lkf;[BI)V", garbageValue = "-322147255" ) - @Export("decompress") public void decompress(Buffer var1, byte[] var2) { if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 if (this.inflater == null) { // L: 17 diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 4e349eeb0e..3edcd7f440 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,34 +11,28 @@ public class GameBuild { @ObfuscatedSignature( descriptor = "Lij;" ) - @Export("LIVE") static final GameBuild LIVE; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lij;" ) - @Export("BUILDLIVE") static final GameBuild BUILDLIVE; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lij;" ) - @Export("RC") static final GameBuild RC; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lij;" ) - @Export("WIP") static final GameBuild WIP; @ObfuscatedName("i") - @Export("name") public final String name; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1493317811 ) - @Export("buildId") final int buildId; static { diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index fa97e106b8..2b68234033 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,61 +10,51 @@ public final class GameObject { @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("entity") public Entity entity; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1221048069 ) - @Export("plane") int plane; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -530812325 ) - @Export("height") int height; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1973574069 ) - @Export("centerX") int centerX; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 589322861 ) - @Export("centerY") int centerY; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 2067900831 ) - @Export("orientation") int orientation; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -37489551 ) - @Export("startX") int startX; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 694891885 ) - @Export("endX") int endX; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 977899527 ) - @Export("startY") int startY; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 523071703 ) - @Export("endY") int endY; @ObfuscatedName("n") @ObfuscatedGetter( @@ -76,19 +65,16 @@ public final class GameObject { @ObfuscatedGetter( intValue = 2140125731 ) - @Export("lastDrawn") int lastDrawn; @ObfuscatedName("h") @ObfuscatedGetter( longValue = 6418610507484255719L ) - @Export("tag") public long tag; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1693237637 ) - @Export("flags") int flags; GameObject() { @@ -124,7 +110,6 @@ public final class GameObject { descriptor = "(IIIIIIIB)V", garbageValue = "-58" ) - @Export("updateRootInterface") static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { if (WorldMapSprite.loadInterface(var0)) { // L: 9643 WorldMapSection1.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 9644 diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 3ec25a32d0..5c717f5f02 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -18,7 +18,6 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -31,58 +30,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedSignature( descriptor = "Lfo;" ) - @Export("taskHandler") protected static TaskHandler taskHandler; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lbw;" ) - @Export("gameShell") static GameShell gameShell; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -823733869 ) - @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; @ObfuscatedName("t") @ObfuscatedGetter( longValue = 5260130147769638647L ) - @Export("stopTimeMs") static long stopTimeMs; @ObfuscatedName("i") - @Export("isKilled") static boolean isKilled; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -551512965 ) - @Export("cycleDurationMillis") static int cycleDurationMillis; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1340319367 ) - @Export("fiveOrOne") static int fiveOrOne; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 253564767 ) - @Export("fps") protected static int fps; @ObfuscatedName("q") - @Export("graphicsTickTimes") static long[] graphicsTickTimes; @ObfuscatedName("f") - @Export("clientTickTimes") static long[] clientTickTimes; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -744176475 ) - @Export("canvasHeight") public static int canvasHeight; @ObfuscatedName("ar") @ObfuscatedGetter( @@ -90,49 +78,40 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene ) static int field477; @ObfuscatedName("ad") - @Export("volatileFocus") static volatile boolean volatileFocus; @ObfuscatedName("ai") - @Export("hasFocus") protected static boolean hasFocus; @ObfuscatedName("aj") @ObfuscatedGetter( longValue = 5656541566078499911L ) - @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; @ObfuscatedName("aw") @ObfuscatedGetter( longValue = -6735850027157901575L ) - @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; @ObfuscatedName("o") - @Export("hasErrored") boolean hasErrored; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -666140821 ) - @Export("contentWidth") protected int contentWidth; @ObfuscatedName("r") @ObfuscatedGetter( intValue = 528808707 ) - @Export("contentHeight") protected int contentHeight; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 2020225171 ) - @Export("canvasX") int canvasX; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -1122384321 ) - @Export("canvasY") int canvasY; @ObfuscatedName("e") @ObfuscatedGetter( @@ -148,27 +127,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedGetter( intValue = 1655899873 ) - @Export("maxCanvasWidth") int maxCanvasWidth; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 1639831573 ) - @Export("maxCanvasHeight") int maxCanvasHeight; @ObfuscatedName("am") - @Export("frame") Frame frame; @ObfuscatedName("ap") - @Export("canvas") java.awt.Canvas canvas; @ObfuscatedName("au") volatile boolean field481; @ObfuscatedName("at") - @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; @ObfuscatedName("aq") - @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; @ObfuscatedName("al") @ObfuscatedGetter( @@ -179,13 +152,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @ObfuscatedSignature( descriptor = "Lbc;" ) - @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; @ObfuscatedName("as") - @Export("clipboard") Clipboard clipboard; @ObfuscatedName("az") - @Export("eventQueue") final EventQueue eventQueue; static { @@ -229,7 +199,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(III)V", garbageValue = "-2029851592" ) - @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 this.method991(); @@ -244,7 +213,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(Ljava/lang/Object;I)V", garbageValue = "-1294823568" ) - @Export("post") final void post(Object var1) { if (this.eventQueue != null) { // L: 108 for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 @@ -263,7 +231,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(B)Lfd;", garbageValue = "51" ) - @Export("mouseWheel") protected MouseWheel mouseWheel() { if (this.mouseWheelHandler == null) { // L: 114 this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 @@ -278,7 +245,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "-726775332" ) - @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 } // L: 123 @@ -288,7 +254,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(Ljava/lang/String;I)V", garbageValue = "783743664" ) - @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 } // L: 127 @@ -298,7 +263,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(B)V", garbageValue = "-47" ) - @Export("setUpKeyboard") protected final void setUpKeyboard() { class8.method105(); // L: 130 java.awt.Canvas var1 = this.canvas; // L: 131 @@ -312,7 +276,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(S)V", garbageValue = "15264" ) - @Export("setUpMouse") protected final void setUpMouse() { GrandExchangeOfferAgeComparator.method242(this.canvas); // L: 140 } // L: 141 @@ -322,7 +285,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "185905257" ) - @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); // L: 144 if (var1 != null) { // L: 145 @@ -360,7 +322,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "912814062" ) - @Export("resizeGame") protected abstract void resizeGame(); @ObfuscatedName("h") @@ -368,7 +329,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "1351857768" ) - @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; // L: 169 int var2 = this.canvasY; // L: 170 @@ -413,7 +373,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "1486323299" ) - @Export("replaceCanvas") final void replaceCanvas() { class182.method3683(this.canvas); // L: 195 WorldMapAreaData.method751(this.canvas); // L: 196 @@ -439,7 +398,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(IIII)V", garbageValue = "-922388983" ) - @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { if (gameShell != null) { // L: 212 @@ -475,7 +433,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "1659845190" ) - @Export("addCanvas") final synchronized void addCanvas() { Container var1 = this.container(); // L: 236 if (this.canvas != null) { // L: 237 @@ -525,7 +482,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)Z", garbageValue = "395568671" ) - @Export("checkHost") protected final boolean checkHost() { String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 275 if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 276 @@ -557,7 +513,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "-152433822" ) - @Export("clientTick") void clientTick() { long var1 = PacketWriter.currentTimeMillis(); // L: 326 long var3 = clientTickTimes[FontName.clientTickTimeIdx]; // L: 327 @@ -578,7 +533,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "1567053941" ) - @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); // L: 338 long var2 = PacketWriter.currentTimeMillis(); // L: 339 @@ -644,7 +598,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "-181155812" ) - @Export("kill") final synchronized void kill() { if (!isKilled) { // L: 378 isKilled = true; // L: 379 @@ -682,7 +635,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "1974240025" ) - @Export("setUp") protected abstract void setUp(); @ObfuscatedName("at") @@ -690,7 +642,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "-720509728" ) - @Export("doCycle") protected abstract void doCycle(); @ObfuscatedName("aq") @@ -698,7 +649,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(ZB)V", garbageValue = "-63" ) - @Export("draw") protected abstract void draw(boolean var1); @ObfuscatedName("al") @@ -706,7 +656,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)V", garbageValue = "-645621446" ) - @Export("kill0") protected abstract void kill0(); @ObfuscatedName("ah") @@ -714,7 +663,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(ILjava/lang/String;ZI)V", garbageValue = "577795912" ) - @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); // L: 468 @@ -781,7 +729,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(Ljava/lang/String;I)V", garbageValue = "1560488333" ) - @Export("error") protected void error(String var1) { if (!this.hasErrored) { // L: 518 this.hasErrored = true; // L: 519 @@ -800,7 +747,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)Ljava/awt/Container;", garbageValue = "1926936525" ) - @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); // L: 528 } @@ -810,7 +756,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(I)Llr;", garbageValue = "-1116469540" ) - @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); // L: 533 int var2 = Math.max(var1.getWidth(), this.field475); // L: 534 @@ -829,7 +774,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene descriptor = "(B)Z", garbageValue = "2" ) - @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; // L: 545 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 187d9386e7..336af6a867 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,13 +10,11 @@ public class GrandExchangeEvent { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive11") static Archive archive11; @ObfuscatedName("hj") @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("scrollBarSprites") static IndexedSprite[] scrollBarSprites; @ObfuscatedName("ji") @ObfuscatedSignature( @@ -28,25 +25,20 @@ public class GrandExchangeEvent { @ObfuscatedGetter( intValue = 152068117 ) - @Export("world") public final int world; @ObfuscatedName("k") @ObfuscatedGetter( longValue = 3809481130081136381L ) - @Export("age") public final long age; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lv;" ) - @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; @ObfuscatedName("t") - @Export("offerName") String offerName; @ObfuscatedName("i") - @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( @@ -74,7 +66,6 @@ public class GrandExchangeEvent { descriptor = "(I)Ljava/lang/String;", garbageValue = "-820260328" ) - @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } @@ -84,7 +75,6 @@ public class GrandExchangeEvent { descriptor = "(I)Ljava/lang/String;", garbageValue = "2082763364" ) - @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; // L: 132 } @@ -94,7 +84,6 @@ public class GrandExchangeEvent { descriptor = "(Ljm;IIIB)V", garbageValue = "6" ) - @Export("addSequenceSoundEffect") static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { // L: 3259 if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3260 @@ -121,7 +110,6 @@ public class GrandExchangeEvent { descriptor = "(Lhq;III)V", garbageValue = "-570952041" ) - @Export("checkIfMinimapClicked") static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3365 if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3366 diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 0db0564de4..68f5fe6d64 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -3,7 +3,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.List; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -13,22 +12,16 @@ import net.runelite.rs.ScriptOpcodes; @Implements("GrandExchangeEvents") public class GrandExchangeEvents { @ObfuscatedName("k") - @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; @ObfuscatedName("s") - @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; @ObfuscatedName("t") - @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; @ObfuscatedName("i") - @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; @ObfuscatedName("ga") - @Export("regionMapArchiveIds") static int[] regionMapArchiveIds; @ObfuscatedName("z") - @Export("events") public final List events; static { @@ -67,7 +60,6 @@ public class GrandExchangeEvents { descriptor = "(Ljava/util/Comparator;ZS)V", garbageValue = "6265" ) - @Export("sort") public void sort(Comparator var1, boolean var2) { if (var2) { // L: 95 Collections.sort(this.events, var1); // L: 96 @@ -284,7 +276,6 @@ public class GrandExchangeEvents { descriptor = "(Ljx;IIII)V", garbageValue = "1036487158" ) - @Export("addNpcToMenu") static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { if (Client.menuOptionsCount < 400) { // L: 8457 if (var0.transforms != null) { // L: 8458 @@ -419,7 +410,6 @@ public class GrandExchangeEvents { descriptor = "(ZI)V", garbageValue = "-775294286" ) - @Export("setTapToDrop") static void setTapToDrop(boolean var0) { Client.tapToDrop = var0; // L: 9631 } // L: 9632 diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index b78561c662..6e15a25ce0 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,37 +12,31 @@ public class GrandExchangeOffer { ) static int field99; @ObfuscatedName("z") - @Export("state") byte state; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1886313297 ) - @Export("id") public int id; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1193190523 ) - @Export("unitPrice") public int unitPrice; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1489525001 ) - @Export("totalQuantity") public int totalQuantity; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -683135485 ) - @Export("currentQuantity") public int currentQuantity; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 2067595945 ) - @Export("currentPrice") public int currentPrice; public GrandExchangeOffer() { @@ -67,7 +60,6 @@ public class GrandExchangeOffer { descriptor = "(I)I", garbageValue = "562486348" ) - @Export("status") public int status() { return this.state & 7; // L: 50 } @@ -77,7 +69,6 @@ public class GrandExchangeOffer { descriptor = "(I)I", garbageValue = "1427821401" ) - @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; // L: 54 } @@ -110,7 +101,6 @@ public class GrandExchangeOffer { descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgn;I)I", garbageValue = "-780286568" ) - @Export("compareStrings") public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { int var3 = var0.length(); // L: 11 int var4 = var1.length(); // L: 12 diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 2866c02d8f..9911e11f38 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,6 +1,5 @@ import java.awt.Component; import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,7 +11,6 @@ final class GrandExchangeOfferAgeComparator implements Comparator { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("SequenceDefinition_skeletonsArchive") public static AbstractArchive SequenceDefinition_skeletonsArchive; @ObfuscatedName("z") @@ -20,7 +18,6 @@ final class GrandExchangeOfferAgeComparator implements Comparator { descriptor = "(Lf;Lf;B)I", garbageValue = "0" ) - @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 366b1b1d64..9bb7fb39f3 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -30,7 +29,6 @@ final class GrandExchangeOfferNameComparator implements Comparator { descriptor = "(Lf;Lf;I)I", garbageValue = "-1190870183" ) - @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } @@ -48,7 +46,6 @@ final class GrandExchangeOfferNameComparator implements Comparator { descriptor = "(II)Ljp;", garbageValue = "-615080564" ) - @Export("getEnum") public static EnumDefinition getEnum(int var0) { EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); // L: 29 if (var1 != null) { // L: 30 @@ -108,7 +105,6 @@ final class GrandExchangeOfferNameComparator implements Comparator { descriptor = "(Lbf;IIB)V", garbageValue = "2" ) - @Export("performPlayerAnimation") static void performPlayerAnimation(Player var0, int var1, int var2) { if (var0.sequence == var1 && var1 != -1) { // L: 3839 int var3 = WorldMapRegion.SequenceDefinition_get(var1).field3535; // L: 3840 @@ -138,7 +134,6 @@ final class GrandExchangeOfferNameComparator implements Comparator { descriptor = "(Lcg;IIIIII)V", garbageValue = "930508889" ) - @Export("drawActor2d") static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { if (var0 != null && var0.isVisible()) { // L: 4429 if (var0 instanceof NPC) { // L: 4430 diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 1c26d04077..66e6fb4d91 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { @ObfuscatedName("z") - @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { @@ -19,7 +17,6 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { descriptor = "(Lf;Lf;I)I", garbageValue = "960814637" ) - @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { if (var2.world == var1.world) { // L: 10953 return 0; @@ -51,7 +48,6 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { descriptor = "(II)I", garbageValue = "1772140785" ) - @Export("Messages_getLastChatID") static int Messages_getLastChatID(int var0) { Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 68 if (var1 == null) { // L: 69 @@ -78,7 +74,6 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { descriptor = "(IIIIS)V", garbageValue = "18134" ) - @Export("drawEntities") static final void drawEntities(int var0, int var1, int var2, int var3) { ++Client.viewportDrawCount; // L: 3990 if (WorldMapLabelSize.localPlayer.x >> 7 == Client.destinationX && WorldMapLabelSize.localPlayer.y >> 7 == Client.destinationY) { // L: 3992 diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 56a400197b..8b86f801f5 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,7 +10,6 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("runesSprite") static IndexedSprite[] runesSprite; @ObfuscatedName("g") public static short[] field83; @@ -21,7 +19,6 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { descriptor = "(Lf;Lf;I)I", garbageValue = "1171850991" ) - @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69 } @@ -68,7 +65,6 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { descriptor = "(IB)Ljq;", garbageValue = "5" ) - @Export("ItemDefinition_get") public static ItemDefinition ItemDefinition_get(int var0) { ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); // L: 92 if (var1 != null) { // L: 93 @@ -125,7 +121,6 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { } @ObfuscatedName("k") - @Export("base37DecodeLong") public static String base37DecodeLong(long var0) { if (var0 > 0L && var0 < 6582952005840035281L) { // L: 34 if (var0 % 37L == 0L) { // L: 35 @@ -175,7 +170,6 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { descriptor = "(II)I", garbageValue = "2133866985" ) - @Export("Widget_unpackTargetMask") public static int Widget_unpackTargetMask(int var0) { return var0 >> 11 & 63; // L: 17 } @@ -185,7 +179,6 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { descriptor = "(Ljava/lang/CharSequence;I)I", garbageValue = "1811677104" ) - @Export("parseInt") public static int parseInt(CharSequence var0) { return UserComparator7.parseIntCustomRadix(var0, 10, true); // L: 67 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index e14a813afe..3b03e6ddeb 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,13 +11,11 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive4") static Archive archive4; @ObfuscatedName("mr") @ObfuscatedGetter( intValue = 401783773 ) - @Export("selectedItemSlot") static int selectedItemSlot; @ObfuscatedName("z") @@ -26,7 +23,6 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { descriptor = "(Lf;Lf;I)I", garbageValue = "1888921269" ) - @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 } @@ -62,7 +58,6 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { descriptor = "(Lhq;I)Z", garbageValue = "798311981" ) - @Export("isComponentHidden") static boolean isComponentHidden(Widget var0) { return var0.isHidden; // L: 10732 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 9c2c941942..1c363f88b6 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,13 +12,11 @@ final class GrandExchangeOfferWorldComparator implements Comparator { @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("modIconSprites") static IndexedSprite[] modIconSprites; @ObfuscatedName("im") @ObfuscatedGetter( intValue = -1435460859 ) - @Export("oculusOrbFocalPointX") static int oculusOrbFocalPointX; @ObfuscatedName("z") @@ -27,7 +24,6 @@ final class GrandExchangeOfferWorldComparator implements Comparator { descriptor = "(Lf;Lf;I)I", garbageValue = "-1922470" ) - @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 3a2d8ecc4d..836ab9b207 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class GraphicsDefaults { @ObfuscatedGetter( intValue = -1162804389 ) - @Export("compass") public int compass; @ObfuscatedName("k") @ObfuscatedGetter( @@ -22,13 +20,11 @@ public class GraphicsDefaults { @ObfuscatedGetter( intValue = 2062877841 ) - @Export("mapScenes") public int mapScenes; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -2100530677 ) - @Export("headIconsPk") public int headIconsPk; @ObfuscatedName("i") @ObfuscatedGetter( @@ -85,7 +81,6 @@ public class GraphicsDefaults { descriptor = "(Lic;I)V", garbageValue = "-2057643179" ) - @Export("decode") public void decode(AbstractArchive var1) { byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3828.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index fb98f29134..52a7e96359 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,7 +1,6 @@ import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,58 +13,48 @@ public final class GraphicsObject extends Entity { @ObfuscatedGetter( intValue = -1326465881 ) - @Export("height") int height; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1027327973 ) - @Export("id") int id; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1536729399 ) - @Export("cycleStart") int cycleStart; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1152665819 ) - @Export("plane") int plane; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1500063053 ) - @Export("x") int x; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1460229241 ) - @Export("y") int y; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Ljm;" ) - @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1933421917 ) - @Export("frame") int frame; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1610487487 ) - @Export("frameCycle") int frameCycle; @ObfuscatedName("m") - @Export("isFinished") boolean isFinished; GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -93,7 +82,6 @@ public final class GraphicsObject extends Entity { descriptor = "(II)V", garbageValue = "-1653124671" ) - @Export("advance") final void advance(int var1) { if (!this.isFinished) { // L: 36 this.frameCycle += var1; // L: 37 @@ -115,7 +103,6 @@ public final class GraphicsObject extends Entity { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected final Model getModel() { SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index a6d5635ef3..2f61581eac 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,22 +10,18 @@ public class HealthBar extends Node { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("Widget_fontsArchive") public static AbstractArchive Widget_fontsArchive; @ObfuscatedName("l") - @Export("BZip2Decompressor_block") static int[] BZip2Decompressor_block; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lir;" ) - @Export("definition") HealthBarDefinition definition; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Ljv;" ) - @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( @@ -42,7 +37,6 @@ public class HealthBar extends Node { descriptor = "(IIIII)V", garbageValue = "-891370152" ) - @Export("put") void put(int var1, int var2, int var3, int var4) { HealthBarUpdate var5 = null; // L: 19 int var6 = 0; // L: 20 @@ -78,7 +72,6 @@ public class HealthBar extends Node { descriptor = "(IB)Lca;", garbageValue = "-95" ) - @Export("get") HealthBarUpdate get(int var1) { HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); // L: 38 if (var2 != null && var2.cycle <= var1) { // L: 39 @@ -103,7 +96,6 @@ public class HealthBar extends Node { descriptor = "(B)Z", garbageValue = "0" ) - @Export("isEmpty") boolean isEmpty() { return this.updates.method4945(); // L: 55 } @@ -607,7 +599,6 @@ public class HealthBar extends Node { descriptor = "(II)I", garbageValue = "-2034460378" ) - @Export("Messages_getNextChatID") static int Messages_getNextChatID(int var0) { Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 if (var1 == null) { // L: 76 @@ -768,7 +759,6 @@ public class HealthBar extends Node { descriptor = "(IIIILlp;Lhz;I)V", garbageValue = "728555201" ) - @Export("drawSpriteOnMinimap") static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { if (var4 != null) { // L: 10662 int var6 = Client.camAngleY & 2047; // L: 10663 diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index c2d6bd7b07..12c0d8eea8 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,21 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("HitSplatDefinition_spritesArchive") public static AbstractArchive HitSplatDefinition_spritesArchive; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("HealthBarDefinition_cachedSprites") public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; @ObfuscatedName("i") @ObfuscatedGetter( @@ -40,19 +35,16 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedGetter( intValue = -2108314947 ) - @Export("int1") public int int1; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1537532305 ) - @Export("int2") public int int2; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -778241871 ) - @Export("int3") public int int3; @ObfuscatedName("n") @ObfuscatedGetter( @@ -63,31 +55,26 @@ public class HealthBarDefinition extends DualNode { @ObfuscatedGetter( intValue = 1932692413 ) - @Export("int5") public int int5; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -2140238063 ) - @Export("frontSpriteID") int frontSpriteID; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1649741031 ) - @Export("backSpriteID") int backSpriteID; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 197104923 ) - @Export("width") public int width; @ObfuscatedName("c") @ObfuscatedGetter( intValue = 127920675 ) - @Export("widthPadding") public int widthPadding; static { @@ -112,7 +99,6 @@ public class HealthBarDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "1885032868" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 43 @@ -129,7 +115,6 @@ public class HealthBarDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "808317446" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 50 var1.readUnsignedShort(); // L: 51 @@ -162,7 +147,6 @@ public class HealthBarDefinition extends DualNode { descriptor = "(I)Llp;", garbageValue = "-1096535425" ) - @Export("getFrontSprite") public Sprite getFrontSprite() { if (this.frontSpriteID < 0) { // L: 69 return null; @@ -186,7 +170,6 @@ public class HealthBarDefinition extends DualNode { descriptor = "(B)Llp;", garbageValue = "1" ) - @Export("getBackSprite") public Sprite getBackSprite() { if (this.backSpriteID < 0) { // L: 79 return null; @@ -210,7 +193,6 @@ public class HealthBarDefinition extends DualNode { descriptor = "(CI)Z", garbageValue = "-1134464400" ) - @Export("isCharPrintable") public static boolean isCharPrintable(char var0) { if (var0 >= ' ' && var0 <= '~') { // L: 183 return true; diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index a1b02581c3..d800419ac3 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,25 +15,21 @@ public class HealthBarUpdate extends Node { @ObfuscatedGetter( intValue = -1931274229 ) - @Export("cycle") int cycle; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1765683631 ) - @Export("health") int health; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1932254665 ) - @Export("health2") int health2; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -488536303 ) - @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { @@ -49,7 +44,6 @@ public class HealthBarUpdate extends Node { descriptor = "(IIIIB)V", garbageValue = "1" ) - @Export("set") void set(int var1, int var2, int var3, int var4) { this.cycle = var1; // L: 19 this.health = var2; // L: 20 diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index e22f4e2161..d483054007 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,7 +11,6 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( @@ -23,37 +21,31 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("HitSplatDefinition_fontsArchive") public static AbstractArchive HitSplatDefinition_fontsArchive; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 840460821 ) - @Export("fontId") int fontId; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -910808373 ) - @Export("textColor") public int textColor; @ObfuscatedName("a") @ObfuscatedGetter( @@ -108,19 +100,16 @@ public class HitSplatDefinition extends DualNode { ) public int field3366; @ObfuscatedName("l") - @Export("transforms") public int[] transforms; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -1795835533 ) - @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = 1163513145 ) - @Export("transformVarp") int transformVarp; static { @@ -152,7 +141,6 @@ public class HitSplatDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "183277091" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 57 @@ -169,7 +157,6 @@ public class HitSplatDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-2105056828" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 64 this.fontId = var1.method5634(); @@ -238,7 +225,6 @@ public class HitSplatDefinition extends DualNode { descriptor = "(B)Ljd;", garbageValue = "-79" ) - @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; // L: 100 if (this.transformVarbit != -1) { // L: 101 @@ -262,7 +248,6 @@ public class HitSplatDefinition extends DualNode { descriptor = "(II)Ljava/lang/String;", garbageValue = "-265851490" ) - @Export("getString") public String getString(int var1) { String var2 = this.field3361; // L: 111 @@ -373,7 +358,6 @@ public class HitSplatDefinition extends DualNode { descriptor = "(I)Lkr;", garbageValue = "-456462046" ) - @Export("getFont") public Font getFont() { if (this.fontId == -1) { // L: 161 return null; diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 12cedc7f23..78dddb895a 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,7 +15,6 @@ public enum HorizontalAlignment implements Enumerated { @ObfuscatedSignature( descriptor = "Lju;" ) - @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(0, 1), @ObfuscatedName("s") @ObfuscatedSignature( @@ -28,13 +26,11 @@ public enum HorizontalAlignment implements Enumerated { @ObfuscatedGetter( intValue = 1646295401 ) - @Export("value") public final int value; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1817509831 ) - @Export("id") final int id; HorizontalAlignment(int var3, int var4) { @@ -47,7 +43,6 @@ public enum HorizontalAlignment implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 23 } @@ -57,7 +52,6 @@ public enum HorizontalAlignment implements Enumerated { descriptor = "(Lky;B)V", garbageValue = "-34" ) - @Export("updatePlayer") static final void updatePlayer(PacketBuffer var0) { var0.importIndex(); // L: 37 int var1 = Client.localPlayerIndex; // L: 38 diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 673b5a287e..9994ec6210 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,28 +7,22 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Huffman") public class Huffman { @ObfuscatedName("o") - @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; @ObfuscatedName("du") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive8") static Archive archive8; @ObfuscatedName("kk") @ObfuscatedGetter( intValue = 360288727 ) - @Export("Client_plane") static int Client_plane; @ObfuscatedName("z") - @Export("masks") int[] masks; @ObfuscatedName("k") - @Export("bits") byte[] bits; @ObfuscatedName("s") - @Export("keys") int[] keys; public Huffman(byte[] var1) { @@ -120,7 +113,6 @@ public class Huffman { descriptor = "([BII[BII)I", garbageValue = "-141428387" ) - @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { int var6 = 0; // L: 63 int var7 = var5 << 3; // L: 64 @@ -171,7 +163,6 @@ public class Huffman { descriptor = "([BI[BIII)I", garbageValue = "-238004531" ) - @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { if (var5 == 0) { // L: 101 return 0; diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 7e3887e8be..ed1c32ca34 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,7 +15,6 @@ public class IgnoreList extends UserList { @ObfuscatedSignature( descriptor = "Lmu;" ) - @Export("loginType") final LoginType loginType; @ObfuscatedSignature( @@ -32,7 +30,6 @@ public class IgnoreList extends UserList { descriptor = "(B)Ljc;", garbageValue = "35" ) - @Export("newInstance") User newInstance() { return new Ignored(); // L: 17 } @@ -42,7 +39,6 @@ public class IgnoreList extends UserList { descriptor = "(IB)[Ljc;", garbageValue = "-19" ) - @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; // L: 21 } @@ -52,7 +48,6 @@ public class IgnoreList extends UserList { descriptor = "(Lkf;IB)V", garbageValue = "-55" ) - @Export("read") public void read(Buffer var1, int var2) { while (true) { if (var1.offset < var2) { // L: 25 diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 2b0e6eb6a6..8b206494fd 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class Ignored extends User { @ObfuscatedGetter( intValue = 1266323763 ) - @Export("id") int id; Ignored() { @@ -22,7 +20,6 @@ public class Ignored extends User { descriptor = "(Lkk;I)I", garbageValue = "1464728446" ) - @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } @@ -32,7 +29,6 @@ public class Ignored extends User { descriptor = "(Ljc;I)I", garbageValue = "-243007320" ) - @Export("compareTo_user") public int compareTo_user(User var1) { return this.compareTo_ignored((Ignored)var1); // L: 13 } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 1e61795d1c..c20321708a 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,35 +5,26 @@ import net.runelite.mapping.ObfuscatedName; @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { @ObfuscatedName("z") - @Export("pixels") public byte[] pixels; @ObfuscatedName("k") - @Export("palette") public int[] palette; @ObfuscatedName("s") - @Export("subWidth") public int subWidth; @ObfuscatedName("t") - @Export("subHeight") public int subHeight; @ObfuscatedName("i") - @Export("xOffset") public int xOffset; @ObfuscatedName("o") - @Export("yOffset") public int yOffset; @ObfuscatedName("x") - @Export("width") public int width; @ObfuscatedName("w") - @Export("height") public int height; IndexedSprite() { } // L: 15 @ObfuscatedName("z") - @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 byte[] var1 = new byte[this.width * this.height]; // L: 19 @@ -55,7 +45,6 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 31 @ObfuscatedName("k") - @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 int var5 = this.palette[var4] >> 16 & 255; // L: 35 @@ -88,7 +77,6 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 @ObfuscatedName("s") - @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 var2 += this.yOffset; // L: 53 @@ -196,7 +184,6 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 158 @ObfuscatedName("t") - @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 88 var5 = -(var5 & 3); // L: 89 @@ -250,7 +237,6 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 @ObfuscatedName("o") - @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 161 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 347eed1bf8..34f9eedd8b 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -1,5 +1,4 @@ import java.util.Random; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,109 +7,84 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Instrument") public class Instrument { @ObfuscatedName("y") - @Export("Instrument_samples") static int[] Instrument_samples; @ObfuscatedName("v") - @Export("Instrument_noise") static int[] Instrument_noise; @ObfuscatedName("j") - @Export("Instrument_sine") static int[] Instrument_sine; @ObfuscatedName("u") - @Export("Instrument_phases") static int[] Instrument_phases; @ObfuscatedName("p") - @Export("Instrument_delays") static int[] Instrument_delays; @ObfuscatedName("b") - @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; @ObfuscatedName("l") - @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; @ObfuscatedName("e") - @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("pitch") SoundEnvelope pitch; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("volume") SoundEnvelope volume; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("pitchModifier") SoundEnvelope pitchModifier; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("release") SoundEnvelope release; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("attack") SoundEnvelope attack; @ObfuscatedName("g") - @Export("oscillatorVolume") int[] oscillatorVolume; @ObfuscatedName("m") - @Export("oscillatorPitch") int[] oscillatorPitch; @ObfuscatedName("n") - @Export("oscillatorDelays") int[] oscillatorDelays; @ObfuscatedName("d") - @Export("delayTime") int delayTime; @ObfuscatedName("h") - @Export("delayDecay") int delayDecay; @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "Ldu;" ) - @Export("filter") AudioFilter filter; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Ldw;" ) - @Export("filterEnvelope") SoundEnvelope filterEnvelope; @ObfuscatedName("c") - @Export("duration") int duration; @ObfuscatedName("f") - @Export("offset") int offset; static { @@ -147,7 +121,6 @@ public class Instrument { } // L: 50 @ObfuscatedName("z") - @Export("synthesize") final int[] synthesize(int var1, int var2) { class310.clearIntArray(Instrument_samples, 0, var1); // L: 53 if (var2 < 10) { // L: 54 @@ -354,7 +327,6 @@ public class Instrument { } @ObfuscatedName("k") - @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 return (var1 & 32767) < 16384 ? var2 : -var2; // L: 180 181 @@ -371,7 +343,6 @@ public class Instrument { @ObfuscatedSignature( descriptor = "(Lkf;)V" ) - @Export("decode") final void decode(Buffer var1) { this.pitch = new SoundEnvelope(); // L: 190 this.pitch.decode(var1); // L: 191 diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 714ad657f8..9b0b8bc7af 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,10 +9,8 @@ public class IntHashTable { @ObfuscatedSignature( descriptor = "Ldr;" ) - @Export("pcmPlayer1") static PcmPlayer pcmPlayer1; @ObfuscatedName("z") - @Export("array") int[] array; public IntHashTable(int[] var1) { @@ -43,7 +40,6 @@ public class IntHashTable { descriptor = "(II)I", garbageValue = "1243310529" ) - @Export("get") public int get(int var1) { int var2 = (this.array.length >> 1) - 1; // L: 20 int var3 = var1 & var2; // L: 21 diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 5bd705292e..cca547ae69 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,7 +5,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("IntegerNode") public class IntegerNode extends Node { @ObfuscatedName("z") - @Export("integer") public int integer; public IntegerNode(int var1) { diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 7745399182..34f6e9ce35 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,13 +9,11 @@ public class InterfaceParent extends Node { @ObfuscatedGetter( intValue = -1616122647 ) - @Export("group") int group; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1330314565 ) - @Export("type") int type; @ObfuscatedName("s") boolean field580; diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index f5313d6c54..827cff1484 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,43 +7,33 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Interpreter") public class Interpreter { @ObfuscatedName("s") - @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; @ObfuscatedName("i") - @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; @ObfuscatedName("o") - @Export("Interpreter_arrays") static int[][] Interpreter_arrays; @ObfuscatedName("x") - @Export("Interpreter_intStack") static int[] Interpreter_intStack; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1375275397 ) - @Export("Interpreter_intStackSize") static int Interpreter_intStackSize; @ObfuscatedName("g") - @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -800989913 ) - @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "[Lba;" ) - @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; @ObfuscatedName("q") - @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; @ObfuscatedName("c") - @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; @ObfuscatedName("y") static boolean field1131; diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index e8ec0fec53..71e795e1b1 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,19 +10,16 @@ public class InvDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1545647129 ) - @Export("size") public int size; static { @@ -39,7 +35,6 @@ public class InvDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "-1963217868" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 32 @@ -56,7 +51,6 @@ public class InvDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-1931159207" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 2) { // L: 39 this.size = var1.readUnsignedShort(); diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 3fa05cf06e..1a5d1cc1ec 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,37 +10,30 @@ public final class IsaacCipher { @ObfuscatedGetter( intValue = -1897659753 ) - @Export("loginBoxCenter") static int loginBoxCenter; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -2032699001 ) - @Export("valuesRemaining") int valuesRemaining; @ObfuscatedName("i") - @Export("results") int[] results; @ObfuscatedName("o") - @Export("mm") int[] mm; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 438764975 ) - @Export("aa") int aa; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 704852085 ) - @Export("bb") int bb; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 208618071 ) - @Export("cc") int cc; public IsaacCipher(int[] var1) { @@ -60,7 +52,6 @@ public final class IsaacCipher { descriptor = "(I)I", garbageValue = "940858488" ) - @Export("nextInt") public final int nextInt() { if (this.valuesRemaining == 0) { // L: 24 this.generateMoreResults(); // L: 25 @@ -89,7 +80,6 @@ public final class IsaacCipher { descriptor = "(I)V", garbageValue = "388315820" ) - @Export("generateMoreResults") final void generateMoreResults() { this.bb += ++this.cc; // L: 43 diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 1af1f0b55d..3ab41ffd4c 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,22 +15,17 @@ public class ItemContainer extends Node { @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("itemContainers") static NodeHashTable itemContainers; @ObfuscatedName("dk") @ObfuscatedSignature( descriptor = "Lln;" ) - @Export("js5Socket") static AbstractSocket js5Socket; @ObfuscatedName("ec") - @Export("worldHost") static String worldHost; @ObfuscatedName("k") - @Export("ids") int[] ids; @ObfuscatedName("s") - @Export("quantities") int[] quantities; static { diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 0e5084f7b2..437c3bfb7e 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,283 +11,230 @@ public class ItemDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("ItemDefinition_modelArchive") static AbstractArchive ItemDefinition_modelArchive; @ObfuscatedName("w") - @Export("ItemDefinition_inMembersWorld") static boolean ItemDefinition_inMembersWorld; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ItemDefinition_cached") static EvictingDualNodeHashTable ItemDefinition_cached; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ItemDefinition_cachedModels") static EvictingDualNodeHashTable ItemDefinition_cachedModels; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; @ObfuscatedName("fn") @ObfuscatedSignature( descriptor = "Lkr;" ) - @Export("fontPlain12") static Font fontPlain12; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -2127308741 ) - @Export("id") public int id; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1602793113 ) - @Export("model") int model; @ObfuscatedName("c") - @Export("name") public String name; @ObfuscatedName("f") - @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("y") - @Export("recolorTo") short[] recolorTo; @ObfuscatedName("v") - @Export("retextureFrom") short[] retextureFrom; @ObfuscatedName("j") - @Export("retextureTo") short[] retextureTo; @ObfuscatedName("r") @ObfuscatedGetter( intValue = 1758314265 ) - @Export("zoom2d") public int zoom2d; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1530794933 ) - @Export("xan2d") public int xan2d; @ObfuscatedName("p") @ObfuscatedGetter( intValue = 86096515 ) - @Export("yan2d") public int yan2d; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1159522461 ) - @Export("zan2d") public int zan2d; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1451755111 ) - @Export("offsetX2d") public int offsetX2d; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 685841117 ) - @Export("offsetY2d") public int offsetY2d; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -85010485 ) - @Export("isStackable") public int isStackable; @ObfuscatedName("ag") @ObfuscatedGetter( intValue = 1232545811 ) - @Export("price") public int price; @ObfuscatedName("ao") - @Export("isMembersOnly") public boolean isMembersOnly; @ObfuscatedName("ae") - @Export("groundActions") public String[] groundActions; @ObfuscatedName("an") - @Export("inventoryActions") public String[] inventoryActions; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = 1175273971 ) - @Export("shiftClickIndex") int shiftClickIndex; @ObfuscatedName("au") @ObfuscatedGetter( intValue = 1901023651 ) - @Export("maleModel") int maleModel; @ObfuscatedName("aa") @ObfuscatedGetter( intValue = 50964429 ) - @Export("maleModel1") int maleModel1; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = 2010056683 ) - @Export("maleOffset") int maleOffset; @ObfuscatedName("at") @ObfuscatedGetter( intValue = 711077729 ) - @Export("femaleModel") int femaleModel; @ObfuscatedName("aq") @ObfuscatedGetter( intValue = -806873799 ) - @Export("femaleModel1") int femaleModel1; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 404192005 ) - @Export("femaleOffset") int femaleOffset; @ObfuscatedName("ah") @ObfuscatedGetter( intValue = -312638611 ) - @Export("maleModel2") int maleModel2; @ObfuscatedName("av") @ObfuscatedGetter( intValue = -440294405 ) - @Export("femaleModel2") int femaleModel2; @ObfuscatedName("ax") @ObfuscatedGetter( intValue = -2008584399 ) - @Export("maleHeadModel") int maleHeadModel; @ObfuscatedName("as") @ObfuscatedGetter( intValue = -2121233033 ) - @Export("maleHeadModel2") int maleHeadModel2; @ObfuscatedName("az") @ObfuscatedGetter( intValue = 1514421507 ) - @Export("femaleHeadModel") int femaleHeadModel; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -1568432281 ) - @Export("femaleHeadModel2") int femaleHeadModel2; @ObfuscatedName("ai") - @Export("countobj") int[] countobj; @ObfuscatedName("ay") - @Export("countco") int[] countco; @ObfuscatedName("aj") @ObfuscatedGetter( intValue = -1332734959 ) - @Export("note") public int note; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = -1348741783 ) - @Export("noteTemplate") public int noteTemplate; @ObfuscatedName("af") @ObfuscatedGetter( intValue = 645309775 ) - @Export("resizeX") int resizeX; @ObfuscatedName("ak") @ObfuscatedGetter( intValue = -96685405 ) - @Export("resizeY") int resizeY; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -948017029 ) - @Export("resizeZ") int resizeZ; @ObfuscatedName("bl") @ObfuscatedGetter( intValue = -1509364621 ) - @Export("ambient") public int ambient; @ObfuscatedName("bc") @ObfuscatedGetter( intValue = 178466347 ) - @Export("contrast") public int contrast; @ObfuscatedName("bz") @ObfuscatedGetter( intValue = 165771595 ) - @Export("team") public int team; @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("params") IterableNodeHashTable params; @ObfuscatedName("bh") - @Export("isTradable") public boolean isTradable; @ObfuscatedName("bi") @ObfuscatedGetter( intValue = 1906961775 ) - @Export("unnotedId") int unnotedId; @ObfuscatedName("bg") @ObfuscatedGetter( intValue = 612376009 ) - @Export("notedId") int notedId; @ObfuscatedName("br") @ObfuscatedGetter( intValue = -956191485 ) - @Export("placeholder") public int placeholder; @ObfuscatedName("bp") @ObfuscatedGetter( intValue = -2061792563 ) - @Export("placeholderTemplate") public int placeholderTemplate; static { @@ -343,7 +289,6 @@ public class ItemDefinition extends DualNode { descriptor = "(I)V", garbageValue = "1532230322" ) - @Export("post") void post() { } // L: 123 @@ -352,7 +297,6 @@ public class ItemDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "-1512040719" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 127 @@ -369,7 +313,6 @@ public class ItemDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-2035131194" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 134 this.model = var1.readUnsignedShort(); @@ -497,7 +440,6 @@ public class ItemDefinition extends DualNode { descriptor = "(Ljq;Ljq;I)V", garbageValue = "2102368712" ) - @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { this.model = var1.model; // L: 219 this.zoom2d = var1.zoom2d; // L: 220 @@ -521,7 +463,6 @@ public class ItemDefinition extends DualNode { descriptor = "(Ljq;Ljq;I)V", garbageValue = "1918043668" ) - @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { this.model = var1.model; // L: 237 this.zoom2d = var1.zoom2d; // L: 238 @@ -565,7 +506,6 @@ public class ItemDefinition extends DualNode { descriptor = "(Ljq;Ljq;B)V", garbageValue = "0" ) - @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { this.model = var1.model; // L: 270 this.zoom2d = var1.zoom2d; // L: 271 @@ -590,7 +530,6 @@ public class ItemDefinition extends DualNode { descriptor = "(II)Lee;", garbageValue = "361581400" ) - @Export("getModelData") public final ModelData getModelData(int var1) { int var3; if (this.countobj != null && var1 > 1) { // L: 289 @@ -636,7 +575,6 @@ public class ItemDefinition extends DualNode { descriptor = "(II)Ler;", garbageValue = "1340452049" ) - @Export("getModel") public final Model getModel(int var1) { if (this.countobj != null && var1 > 1) { // L: 313 int var2 = -1; // L: 314 @@ -690,7 +628,6 @@ public class ItemDefinition extends DualNode { descriptor = "(II)Ljq;", garbageValue = "-1034116663" ) - @Export("getCountObj") public ItemDefinition getCountObj(int var1) { if (this.countobj != null && var1 > 1) { // L: 342 int var2 = -1; // L: 343 @@ -714,7 +651,6 @@ public class ItemDefinition extends DualNode { descriptor = "(ZI)Z", garbageValue = "-627527711" ) - @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { int var2 = this.maleModel; // L: 427 int var3 = this.maleModel1; // L: 428 @@ -875,7 +811,6 @@ public class ItemDefinition extends DualNode { descriptor = "(III)I", garbageValue = "678325185" ) - @Export("getIntParam") public int getIntParam(int var1, int var2) { return Username.method5309(this.params, var1, var2); // L: 523 } @@ -885,7 +820,6 @@ public class ItemDefinition extends DualNode { descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", garbageValue = "6" ) - @Export("getStringParam") public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; // L: 528 String var3; @@ -908,7 +842,6 @@ public class ItemDefinition extends DualNode { descriptor = "(B)I", garbageValue = "-17" ) - @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 545 if (this.shiftClickIndex >= 0) { // L: 546 diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 32c6b34837..d942aad454 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,13 +10,11 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("sentinel") public DualNode sentinel; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("head") DualNode head; public IterableDualNodeQueue() { @@ -27,7 +24,6 @@ public class IterableDualNodeQueue implements Iterable { } // L: 13 @ObfuscatedName("z") - @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 this.sentinel.previousDual.removeDual(); // L: 17 @@ -39,7 +35,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "(Lgs;)V" ) - @Export("add") public void add(DualNode var1) { if (var1.nextDual != null) { // L: 22 var1.removeDual(); @@ -55,7 +50,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "()Lgs;" ) - @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; // L: 38 if (var1 == this.sentinel) { @@ -70,7 +64,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "()Lgs;" ) - @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); // L: 45 } @@ -79,7 +72,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "(Lgs;)Lgs;" ) - @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; if (var1 == null) { // L: 50 @@ -101,7 +93,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "()Lgs;" ) - @Export("previous") public DualNode previous() { DualNode var1 = this.head; // L: 61 if (var1 == this.sentinel) { // L: 62 @@ -121,7 +112,6 @@ public class IterableDualNodeQueue implements Iterable { @ObfuscatedSignature( descriptor = "(Lgs;Lgs;)V" ) - @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { if (var0.nextDual != null) { // L: 30 var0.removeDual(); diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 1701660ca5..e8ee26b494 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,19 +10,16 @@ public class IterableDualNodeQueueIterator implements Iterator { @ObfuscatedSignature( descriptor = "Ljh;" ) - @Export("queue") IterableDualNodeQueue queue; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("head") DualNode head; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lgs;" ) - @Export("last") DualNode last; @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index e51271c71c..6bd58031a1 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -1,6 +1,5 @@ import java.util.Collection; import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,7 +11,6 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("sentinel") Node sentinel; @ObfuscatedName("k") @ObfuscatedSignature( @@ -27,7 +25,6 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 13 @ObfuscatedName("z") - @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 this.sentinel.previous.remove(); // L: 17 @@ -39,7 +36,6 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedSignature( descriptor = "(Lgw;)V" ) - @Export("addFirst") public void addFirst(Node var1) { if (var1.next != null) { // L: 22 var1.remove(); @@ -55,7 +51,6 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedSignature( descriptor = "(Lgw;)V" ) - @Export("addLast") public void addLast(Node var1) { if (var1.next != null) { // L: 30 var1.remove(); @@ -71,7 +66,6 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("last") public Node last() { return this.method4946((Node)null); // L: 46 } @@ -101,7 +95,6 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("previous") public Node previous() { Node var1 = this.field3554; // L: 62 if (var1 == this.sentinel) { // L: 63 @@ -223,7 +216,6 @@ public class IterableNodeDeque implements Iterable, Collection { @ObfuscatedSignature( descriptor = "(Lgw;Lgw;)V" ) - @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { if (var0.next != null) { // L: 38 var0.remove(); diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 7dd525b14c..515fa4f6c1 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,7 +10,6 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( descriptor = "Ljv;" ) - @Export("deque") IterableNodeDeque deque; @ObfuscatedName("k") @ObfuscatedSignature( @@ -22,7 +20,6 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("last") Node last; @ObfuscatedSignature( @@ -37,14 +34,12 @@ public class IterableNodeDequeDescendingIterator implements Iterator { @ObfuscatedSignature( descriptor = "(Ljv;)V" ) - @Export("setDeque") void setDeque(IterableNodeDeque var1) { this.deque = var1; // L: 16 this.start(); // L: 17 } // L: 18 @ObfuscatedName("w") - @Export("start") void start() { this.field3562 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 9be41dfe7b..8db12c56f8 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,28 +7,23 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { @ObfuscatedName("z") - @Export("size") int size; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "[Lgw;" ) - @Export("buckets") Node[] buckets; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("currentGet") Node currentGet; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("current") Node current; @ObfuscatedName("i") - @Export("index") int index; public IterableNodeHashTable(int var1) { @@ -49,7 +43,6 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedSignature( descriptor = "(J)Lgw;" ) - @Export("get") public Node get(long var1) { Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 @@ -69,7 +62,6 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedSignature( descriptor = "(Lgw;J)V" ) - @Export("put") public void put(Node var1, long var2) { if (var1.next != null) { // L: 39 var1.remove(); @@ -84,7 +76,6 @@ public final class IterableNodeHashTable implements Iterable { } // L: 46 @ObfuscatedName("s") - @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 Node var2 = this.buckets[var1]; // L: 50 @@ -107,7 +98,6 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("first") public Node first() { this.index = 0; // L: 62 return this.next(); // L: 63 @@ -117,7 +107,6 @@ public final class IterableNodeHashTable implements Iterable { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("next") public Node next() { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index cd25ea1697..d65401d74b 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,22 +10,18 @@ public class IterableNodeHashTableIterator implements Iterator { @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("hashTable") IterableNodeHashTable hashTable; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("head") Node head; @ObfuscatedName("s") - @Export("index") int index; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("last") Node last; @ObfuscatedSignature( @@ -39,7 +34,6 @@ public class IterableNodeHashTableIterator implements Iterator { } // L: 15 @ObfuscatedName("x") - @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 this.index = 1; // L: 19 diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 869993e3b9..cca2b92780 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,5 +1,4 @@ import java.io.File; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,34 +7,28 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("JagexCache") public class JagexCache { @ObfuscatedName("t") - @Export("JagexCache_locationFile") static File JagexCache_locationFile; @ObfuscatedName("i") - @Export("cacheDir") static File cacheDir; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "Lmz;" ) - @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lmz;" ) - @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "Lmz;" ) - @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "[Lmz;" ) - @Export("JagexCache_idxFiles") public static BufferedFile[] JagexCache_idxFiles; @ObfuscatedName("r") public static String field2094; @@ -51,7 +44,6 @@ public class JagexCache { descriptor = "(IIIII)V", garbageValue = "1010534169" ) - @Export("addSceneMenuOptions") static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 8289 StructDefinition.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 8290 diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 67b3d14683..6aa8c822e4 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,7 +2,6 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,10 +15,8 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedSignature( descriptor = "Lbz;" ) - @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; @ObfuscatedName("cu") - @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; @ObfuscatedName("cc") public static int[] field409; @@ -63,10 +60,8 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedGetter( intValue = -2101231775 ) - @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; @ObfuscatedName("cy") - @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; @ObfuscatedName("dr") @ObfuscatedGetter( @@ -271,7 +266,6 @@ public final class KeyHandler implements KeyListener, FocusListener { descriptor = "([Lhq;IIIZI)V", garbageValue = "102322570" ) - @Export("resizeInterface") static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9227 Widget var6 = var0[var5]; // L: 9228 diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index fde5f3fc95..7f348149b0 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,52 +10,40 @@ public class KitDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 12947469 ) - @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("KitDefinition_cached") public static EvictingDualNodeHashTable KitDefinition_cached; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -346028961 ) - @Export("bodypartID") public int bodypartID; @ObfuscatedName("o") - @Export("models2") int[] models2; @ObfuscatedName("x") - @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("w") - @Export("recolorTo") short[] recolorTo; @ObfuscatedName("g") - @Export("retextureFrom") short[] retextureFrom; @ObfuscatedName("m") - @Export("retextureTo") short[] retextureTo; @ObfuscatedName("n") - @Export("models") int[] models; @ObfuscatedName("d") - @Export("nonSelectable") public boolean nonSelectable; static { @@ -74,7 +61,6 @@ public class KitDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "-861511508" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 44 @@ -91,7 +77,6 @@ public class KitDefinition extends DualNode { descriptor = "(Lkf;IB)V", garbageValue = "36" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 51 this.bodypartID = var1.readUnsignedByte(); @@ -137,7 +122,6 @@ public class KitDefinition extends DualNode { descriptor = "(B)Z", garbageValue = "-62" ) - @Export("ready") public boolean ready() { if (this.models2 == null) { // L: 81 return true; @@ -159,7 +143,6 @@ public class KitDefinition extends DualNode { descriptor = "(I)Lee;", garbageValue = "-1978614087" ) - @Export("getModelData") public ModelData getModelData() { if (this.models2 == null) { // L: 88 return null; @@ -216,7 +199,6 @@ public class KitDefinition extends DualNode { descriptor = "(B)Lee;", garbageValue = "16" ) - @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { ModelData[] var1 = new ModelData[5]; // L: 116 int var2 = 0; // L: 117 @@ -249,7 +231,6 @@ public class KitDefinition extends DualNode { descriptor = "(S)V", garbageValue = "1024" ) - @Export("FriendSystem_invalidateIgnoreds") static final void FriendSystem_invalidateIgnoreds() { UserComparator8.method3497(); // L: 10675 if (Entity.clanChat != null) { // L: 10676 diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 09412b985c..32d47cf980 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -1,5 +1,4 @@ import java.util.Locale; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,60 +11,50 @@ public class Language implements Enumerated { @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_EN") public static final Language Language_EN; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_DE") static final Language Language_DE; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_FR") public static final Language Language_FR; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_PT") static final Language Language_PT; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_NL") static final Language Language_NL; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_ES") public static final Language Language_ES; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("Language_ES_MX") static final Language Language_ES_MX; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "[Lgn;" ) - @Export("Language_valuesOrdered") public static final Language[] Language_valuesOrdered; @ObfuscatedName("w") final String field2387; @ObfuscatedName("g") - @Export("language") final String language; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 2011360821 ) - @Export("id") final int id; static { @@ -111,7 +100,6 @@ public class Language implements Enumerated { descriptor = "(I)Ljava/lang/String;", garbageValue = "1763794440" ) - @Export("getLanguage") String getLanguage() { return this.language; // L: 56 } @@ -121,7 +109,6 @@ public class Language implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 60 } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index cc126ea103..477fa2a47f 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,17 +9,14 @@ public class Link { @ObfuscatedSignature( descriptor = "Lgr;" ) - @Export("previous") public Link previous; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgr;" ) - @Export("next") public Link next; @ObfuscatedName("z") - @Export("remove") public void remove() { if (this.next != null) { // L: 8 this.next.previous = this.previous; // L: 9 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 3f49c2f38c..c36b4f58a7 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class LinkDeque { @ObfuscatedSignature( descriptor = "Lgr;" ) - @Export("sentinel") Link sentinel; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgr;" ) - @Export("current") Link current; public LinkDeque() { @@ -29,7 +26,6 @@ public class LinkDeque { @ObfuscatedSignature( descriptor = "(Lgr;)V" ) - @Export("addFirst") public void addFirst(Link var1) { if (var1.next != null) { // L: 15 var1.remove(); @@ -45,7 +41,6 @@ public class LinkDeque { @ObfuscatedSignature( descriptor = "()Lgr;" ) - @Export("last") public Link last() { Link var1 = this.sentinel.previous; // L: 23 if (var1 == this.sentinel) { // L: 24 @@ -61,7 +56,6 @@ public class LinkDeque { @ObfuscatedSignature( descriptor = "()Lgr;" ) - @Export("previous") public Link previous() { Link var1 = this.current; // L: 33 if (var1 == this.sentinel) { // L: 34 diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 3ce78be73b..47f4385a1c 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,5 +1,4 @@ import java.text.DecimalFormat; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -9,19 +8,16 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Login") public class Login { @ObfuscatedName("k") - @Export("clearLoginScreen") static boolean clearLoginScreen; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1062905543 ) - @Export("xPadding") static int xPadding; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("rightTitleSprite") static Sprite rightTitleSprite; @ObfuscatedName("a") @ObfuscatedSignature( @@ -32,16 +28,13 @@ public class Login { @ObfuscatedGetter( intValue = -760884959 ) - @Export("loginBoxX") static int loginBoxX; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 496089237 ) - @Export("Login_loadingPercent") static int Login_loadingPercent; @ObfuscatedName("p") - @Export("Login_loadingText") static String Login_loadingText; @ObfuscatedName("ae") @ObfuscatedGetter( @@ -57,25 +50,18 @@ public class Login { @ObfuscatedGetter( intValue = 662808535 ) - @Export("loginIndex") static int loginIndex; @ObfuscatedName("aq") - @Export("Login_response0") static String Login_response0; @ObfuscatedName("al") - @Export("Login_response1") static String Login_response1; @ObfuscatedName("ah") - @Export("Login_response2") static String Login_response2; @ObfuscatedName("av") - @Export("Login_response3") static String Login_response3; @ObfuscatedName("ax") - @Export("Login_username") static String Login_username; @ObfuscatedName("as") - @Export("Login_password") static String Login_password; @ObfuscatedName("af") static boolean field1224; @@ -87,34 +73,28 @@ public class Login { @ObfuscatedGetter( intValue = -189383965 ) - @Export("currentLoginField") static int currentLoginField; @ObfuscatedName("bg") - @Export("worldSelectOpen") static boolean worldSelectOpen; @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("worldSelectStars") static IndexedSprite[] worldSelectStars; @ObfuscatedName("bm") @ObfuscatedGetter( intValue = -322396857 ) - @Export("hoveredWorldIndex") static int hoveredWorldIndex; @ObfuscatedName("bd") @ObfuscatedGetter( intValue = -1129392139 ) - @Export("worldSelectPage") static int worldSelectPage; @ObfuscatedName("bb") @ObfuscatedGetter( intValue = 1846745523 ) - @Export("worldSelectPagesCount") static int worldSelectPagesCount; @ObfuscatedName("bq") @ObfuscatedGetter( diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 4cf99c9397..e9f1b8b03d 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -41,19 +40,16 @@ public class LoginPacket implements class190 { @ObfuscatedSignature( descriptor = "[Lgc;" ) - @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; @ObfuscatedName("gq") @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("compass") static Sprite compass; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -176591909 ) - @Export("id") public final int id; static { diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index f3c1821a82..065cadd016 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -21,7 +20,6 @@ public class LoginScreenAnimation { @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("sprites") IndexedSprite[] sprites; @ObfuscatedName("x") int[] field1075; @@ -92,7 +90,6 @@ public class LoginScreenAnimation { descriptor = "(B)V", garbageValue = "87" ) - @Export("initColors") void initColors() { this.field1064 = new int[256]; // L: 35 @@ -181,7 +178,6 @@ public class LoginScreenAnimation { descriptor = "(IIB)V", garbageValue = "0" ) - @Export("draw") void draw(int var1, int var2) { if (this.field1058 == null) { // L: 73 this.initColors(); // L: 74 diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 5e736eeb97..17acaa31c5 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class LoginType { @ObfuscatedSignature( descriptor = "Lmu;" ) - @Export("oldscape") public static final LoginType oldscape; @ObfuscatedName("k") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 0bb2dbfd14..d859a04645 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,34 +10,28 @@ public class MenuAction { @ObfuscatedSignature( descriptor = "Lkf;" ) - @Export("NetCache_reference") static Buffer NetCache_reference; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1817310685 ) - @Export("opcode") int opcode; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -670222051 ) - @Export("param0") int param0; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1502625343 ) - @Export("param1") int param1; @ObfuscatedName("t") - @Export("action") String action; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 691220539 ) - @Export("identifier") int identifier; MenuAction() { diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 615a7a5f90..58040b277d 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,52 +10,42 @@ public class Message extends DualNode { @ObfuscatedSignature( descriptor = "Lmx;" ) - @Export("worldMap") static WorldMap worldMap; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 771571173 ) - @Export("count") int count; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -804370839 ) - @Export("cycle") int cycle; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 310309169 ) - @Export("type") int type; @ObfuscatedName("t") - @Export("sender") String sender; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lku;" ) - @Export("senderUsername") Username senderUsername; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("isFromFriend0") TriBool isFromFriend0; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("isFromIgnored0") TriBool isFromIgnored0; @ObfuscatedName("w") - @Export("prefix") String prefix; @ObfuscatedName("g") - @Export("text") String text; Message(int var1, String var2, String var3, String var4) { @@ -70,7 +59,6 @@ public class Message extends DualNode { descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", garbageValue = "28" ) - @Export("set") void set(int var1, String var2, String var3, String var4) { int var5 = ++Messages.Messages_count - 1; // L: 25 this.count = var5; // L: 27 @@ -89,7 +77,6 @@ public class Message extends DualNode { descriptor = "(B)V", garbageValue = "-57" ) - @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 @@ -99,7 +86,6 @@ public class Message extends DualNode { descriptor = "(B)Z", garbageValue = "-115" ) - @Export("isFromFriend") final boolean isFromFriend() { if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 this.fillIsFromFriend(); // L: 44 @@ -113,7 +99,6 @@ public class Message extends DualNode { descriptor = "(I)V", garbageValue = "-47255168" ) - @Export("fillIsFromFriend") void fillIsFromFriend() { this.isFromFriend0 = class60.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 } // L: 51 @@ -123,7 +108,6 @@ public class Message extends DualNode { descriptor = "(I)V", garbageValue = "1621996049" ) - @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 } // L: 55 @@ -133,7 +117,6 @@ public class Message extends DualNode { descriptor = "(B)Z", garbageValue = "77" ) - @Export("isFromIgnored") final boolean isFromIgnored() { if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 58 this.fillIsFromIgnored(); // L: 59 @@ -147,7 +130,6 @@ public class Message extends DualNode { descriptor = "(I)V", garbageValue = "-556586926" ) - @Export("fillIsFromIgnored") void fillIsFromIgnored() { this.isFromIgnored0 = class60.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 } // L: 66 @@ -157,7 +139,6 @@ public class Message extends DualNode { descriptor = "(I)V", garbageValue = "-1023738000" ) - @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { // L: 69 this.senderUsername = new Username(SecureRandomCallable.method1202(this.sender), WorldMapAreaData.loginType); diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 8557fc5821..70682717e1 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -1,6 +1,5 @@ import java.util.HashMap; import java.util.Map; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -10,34 +9,28 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Messages") public class Messages { @ObfuscatedName("sb") - @Export("foundItemIds") static short[] foundItemIds; @ObfuscatedName("z") - @Export("Messages_channels") static final Map Messages_channels; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Ljh;" ) - @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 785090077 ) - @Export("Messages_count") static int Messages_count; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("Widget_spritesArchive") public static AbstractArchive Widget_spritesArchive; static { diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index afaefbd7c9..c6a0fb384d 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,19 +11,14 @@ public class MidiFileReader { @ObfuscatedSignature( descriptor = "Lkf;" ) - @Export("buffer") Buffer buffer; @ObfuscatedName("k") - @Export("division") int division; @ObfuscatedName("s") - @Export("trackStarts") int[] trackStarts; @ObfuscatedName("t") - @Export("trackPositions") int[] trackPositions; @ObfuscatedName("i") - @Export("trackLengths") int[] trackLengths; @ObfuscatedName("o") int[] field2493; @@ -47,7 +41,6 @@ public class MidiFileReader { } // L: 23 @ObfuscatedName("z") - @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; // L: 30 this.buffer.offset = 10; // L: 33 @@ -82,7 +75,6 @@ public class MidiFileReader { } // L: 53 @ObfuscatedName("k") - @Export("clear") void clear() { this.buffer.array = null; // L: 56 this.trackStarts = null; // L: 57 @@ -92,37 +84,31 @@ public class MidiFileReader { } // L: 61 @ObfuscatedName("s") - @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } @ObfuscatedName("t") - @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } @ObfuscatedName("i") - @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 @ObfuscatedName("o") - @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 @ObfuscatedName("x") - @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 @ObfuscatedName("w") - @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 int[] var10000 = this.trackLengths; @@ -130,14 +116,12 @@ public class MidiFileReader { } // L: 86 @ObfuscatedName("g") - @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } @ObfuscatedName("m") - @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; @@ -214,7 +198,6 @@ public class MidiFileReader { } @ObfuscatedName("h") - @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 int var2 = -1; // L: 152 @@ -231,7 +214,6 @@ public class MidiFileReader { } @ObfuscatedName("a") - @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -245,7 +227,6 @@ public class MidiFileReader { } @ObfuscatedName("q") - @Export("reset") void reset(long var1) { this.field2499 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index d47e74b874..23329500ed 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,13 +10,11 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("worldSelectBackSprites") static Sprite[] worldSelectBackSprites; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("musicPatches") NodeHashTable musicPatches; @ObfuscatedName("k") @ObfuscatedGetter( @@ -73,7 +70,6 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "Lhf;" ) - @Export("midiFile") MidiFileReader midiFile; @ObfuscatedName("ao") boolean field2462; @@ -81,13 +77,11 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedGetter( intValue = -986851911 ) - @Export("track") int track; @ObfuscatedName("an") @ObfuscatedGetter( intValue = -1235186361 ) - @Export("trackLength") int trackLength; @ObfuscatedName("am") @ObfuscatedGetter( @@ -103,7 +97,6 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "Lhb;" ) - @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { @@ -137,7 +130,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(II)V", garbageValue = "371443257" ) - @Export("setPcmStreamVolume") synchronized void setPcmStreamVolume(int var1) { this.field2458 = var1; } @@ -156,7 +148,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(Lhj;Lic;Lds;IB)Z", garbageValue = "5" ) - @Export("loadMusicTrack") synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { var1.method4008(); boolean var5 = true; @@ -203,7 +194,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(I)V", garbageValue = "140866669" ) - @Export("clearAll") synchronized void clearAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 var1.clear(); @@ -216,7 +206,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(I)V", garbageValue = "1347552645" ) - @Export("removeAll") synchronized void removeAll() { for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 var1.remove(); @@ -228,7 +217,6 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; // L: 469 } @@ -237,7 +225,6 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; // L: 473 } @@ -248,7 +235,6 @@ public class MidiPcmStream extends PcmStream { } @ObfuscatedName("g") - @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { // L: 481 int var4 = this.midiFile.division * this.field2456 / PcmPlayer.field1447; // L: 482 @@ -277,7 +263,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(Lhj;ZI)V", garbageValue = "2052345707" ) - @Export("setMusicTrack") synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); // L: 97 this.midiFile.parse(var1.midi); // L: 98 @@ -297,7 +282,6 @@ public class MidiPcmStream extends PcmStream { } // L: 110 @ObfuscatedName("n") - @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { // L: 502 int var2 = this.midiFile.division * this.field2456 / PcmPlayer.field1447; // L: 503 @@ -325,7 +309,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(I)V", garbageValue = "-836752904" ) - @Export("clear") public synchronized void clear() { this.midiFile.clear(); // L: 113 this.method3824(); // L: 114 @@ -336,7 +319,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(I)Z", garbageValue = "-1789477746" ) - @Export("isReady") synchronized boolean isReady() { return this.midiFile.isReady(); // L: 118 } @@ -1095,7 +1077,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(II)Ljg;", garbageValue = "-2143531135" ) - @Export("getObjectDefinition") public static ObjectDefinition getObjectDefinition(int var0) { ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); // L: 72 if (var1 != null) { // L: 73 @@ -1145,7 +1126,6 @@ public class MidiPcmStream extends PcmStream { descriptor = "(IIIII)V", garbageValue = "-1830398004" ) - @Export("itemContainerSetItem") static void itemContainerSetItem(int var0, int var1, int var2, int var3) { ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 if (var4 == null) { // L: 40 diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 855bae833b..0f20a0b7e5 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -53,7 +52,6 @@ public class MilliClock extends Clock { descriptor = "(I)V", garbageValue = "208275261" ) - @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { // L: 25 this.field2057[var1] = 0L; // L: 26 @@ -66,7 +64,6 @@ public class MilliClock extends Clock { descriptor = "(III)I", garbageValue = "-16016139" ) - @Export("wait") public int wait(int var1, int var2) { int var3 = this.field2053; // L: 31 int var4 = this.field2055; // L: 32 @@ -123,7 +120,6 @@ public class MilliClock extends Clock { descriptor = "(CI)Z", garbageValue = "-473742756" ) - @Export("isCharAlphabetic") public static boolean isCharAlphabetic(char var0) { return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 142 } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 3495e15cf2..07eba8f760 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,6 +1,5 @@ import java.util.HashSet; import java.util.Set; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -79,7 +78,6 @@ public enum ModeWhere implements Enumerated { @ObfuscatedGetter( intValue = 1536594685 ) - @Export("id") final int id; @ObfuscatedName("q") final Set field2418; @@ -113,7 +111,6 @@ public enum ModeWhere implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 54 } @@ -166,7 +163,6 @@ public enum ModeWhere implements Enumerated { descriptor = "(IZI)Ljava/lang/String;", garbageValue = "1007074370" ) - @Export("intToString") public static String intToString(int var0, boolean var1) { if (var1 && var0 >= 0) { // L: 105 int var3 = var0; // L: 107 diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 9e1748dfef..f03b8af204 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,29 +9,23 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "Ler;" ) - @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; @ObfuscatedName("k") - @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Ler;" ) - @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; @ObfuscatedName("t") - @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; @ObfuscatedName("ah") static boolean[] field1747; @ObfuscatedName("av") static boolean[] field1734; @ObfuscatedName("ax") - @Export("modelViewportXs") static int[] modelViewportXs; @ObfuscatedName("as") - @Export("modelViewportYs") static int[] modelViewportYs; @ObfuscatedName("az") static int[] field1760; @@ -63,69 +56,50 @@ public class Model extends Entity { @ObfuscatedName("bi") static int[] field1751; @ObfuscatedName("bg") - @Export("Model_transformTempX") static int Model_transformTempX; @ObfuscatedName("br") - @Export("Model_transformTempY") static int Model_transformTempY; @ObfuscatedName("bp") - @Export("Model_transformTempZ") static int Model_transformTempZ; @ObfuscatedName("bn") static boolean field1700; @ObfuscatedName("bu") - @Export("Model_sine") static int[] Model_sine; @ObfuscatedName("ba") - @Export("Model_cosine") static int[] Model_cosine; @ObfuscatedName("bm") static int[] field1756; @ObfuscatedName("bd") static int[] field1761; @ObfuscatedName("i") - @Export("verticesCount") int verticesCount; @ObfuscatedName("o") - @Export("verticesX") int[] verticesX; @ObfuscatedName("x") - @Export("verticesY") int[] verticesY; @ObfuscatedName("w") - @Export("verticesZ") int[] verticesZ; @ObfuscatedName("g") - @Export("indicesCount") int indicesCount; @ObfuscatedName("m") - @Export("indices1") int[] indices1; @ObfuscatedName("n") - @Export("indices2") int[] indices2; @ObfuscatedName("d") - @Export("indices3") int[] indices3; @ObfuscatedName("h") - @Export("faceColors1") int[] faceColors1; @ObfuscatedName("a") - @Export("faceColors2") int[] faceColors2; @ObfuscatedName("q") - @Export("faceColors3") int[] faceColors3; @ObfuscatedName("c") - @Export("faceRenderPriorities") byte[] faceRenderPriorities; @ObfuscatedName("f") - @Export("faceAlphas") byte[] faceAlphas; @ObfuscatedName("y") byte[] field1757; @ObfuscatedName("v") - @Export("faceTextures") short[] faceTextures; @ObfuscatedName("j") byte field1720; @@ -138,46 +112,32 @@ public class Model extends Entity { @ObfuscatedName("b") int[] field1717; @ObfuscatedName("l") - @Export("vertexLabels") int[][] vertexLabels; @ObfuscatedName("e") - @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; @ObfuscatedName("ab") - @Export("isSingleTile") public boolean isSingleTile; @ObfuscatedName("ag") - @Export("boundsType") int boundsType; @ObfuscatedName("ao") - @Export("bottomY") int bottomY; @ObfuscatedName("ae") - @Export("xzRadius") int xzRadius; @ObfuscatedName("an") - @Export("diameter") int diameter; @ObfuscatedName("am") - @Export("radius") int radius; @ObfuscatedName("ap") - @Export("xMid") int xMid; @ObfuscatedName("au") - @Export("yMid") int yMid; @ObfuscatedName("aa") - @Export("zMid") int zMid; @ObfuscatedName("ar") - @Export("xMidOffset") int xMidOffset; @ObfuscatedName("at") - @Export("yMidOffset") int yMidOffset; @ObfuscatedName("aq") - @Export("zMidOffset") int zMidOffset; static { @@ -367,7 +327,6 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "([[IIIIZI)Ler;" ) - @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBoundsCylinder(); // L: 169 int var7 = var2 - this.xzRadius; // L: 170 @@ -465,7 +424,6 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "(Z)Ler;" ) - @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 246 Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; @@ -478,7 +436,6 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "(Z)Ler;" ) - @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 251 Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; @@ -491,7 +448,6 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "(ZLer;[B)Ler;" ) - @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 256 var2.indicesCount = this.indicesCount; // L: 257 @@ -545,7 +501,6 @@ public class Model extends Entity { } @ObfuscatedName("i") - @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 300 int var2 = 0; // L: 301 @@ -609,7 +564,6 @@ public class Model extends Entity { } // L: 334 @ObfuscatedName("o") - @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 337 this.boundsType = 1; // L: 338 @@ -670,7 +624,6 @@ public class Model extends Entity { } @ObfuscatedName("m") - @Export("resetBounds") void resetBounds() { this.boundsType = 0; // L: 378 this.xMidOffset = -1; // L: 379 @@ -680,7 +633,6 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "(Lef;I)V" ) - @Export("animate") public void animate(Frames var1, int var2) { if (this.vertexLabels != null) { // L: 383 if (var2 != -1) { // L: 384 @@ -704,7 +656,6 @@ public class Model extends Entity { @ObfuscatedSignature( descriptor = "(Lef;ILef;I[I)V" ) - @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { if (var2 != -1) { // L: 398 if (var5 != null && var4 != -1) { // L: 399 @@ -753,7 +704,6 @@ public class Model extends Entity { } // L: 401 427 @ObfuscatedName("h") - @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 430 int var7; @@ -921,7 +871,6 @@ public class Model extends Entity { } // L: 459 474 516 537 555 557 @ObfuscatedName("a") - @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 int var2 = this.verticesX[var1]; // L: 561 @@ -933,7 +882,6 @@ public class Model extends Entity { } // L: 566 @ObfuscatedName("q") - @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 this.verticesX[var1] = -this.verticesX[var1]; // L: 570 @@ -944,7 +892,6 @@ public class Model extends Entity { } // L: 574 @ObfuscatedName("c") - @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 int var2 = this.verticesZ[var1]; // L: 578 @@ -956,7 +903,6 @@ public class Model extends Entity { } // L: 583 @ObfuscatedName("j") - @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 586 int var3 = Model_cosine[var1]; // L: 587 @@ -971,7 +917,6 @@ public class Model extends Entity { } // L: 594 @ObfuscatedName("r") - @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 int[] var10000 = this.verticesX; // L: 598 @@ -986,7 +931,6 @@ public class Model extends Entity { } // L: 603 @ObfuscatedName("u") - @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 607 @@ -1126,7 +1070,6 @@ public class Model extends Entity { } // L: 720 @ObfuscatedName("l") - @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { if (this.diameter < 1600) { // L: 844 int var6; @@ -1351,7 +1294,6 @@ public class Model extends Entity { } // L: 902 993 @ObfuscatedName("e") - @Export("drawFace") final void drawFace(int var1) { if (field1734[var1]) { // L: 996 this.method3051(var1); // L: 997 @@ -1563,7 +1505,6 @@ public class Model extends Entity { } // L: 1179 @ObfuscatedName("cb") - @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { field1742[0] = -1; // L: 723 if (this.boundsType != 1) { // L: 724 diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index e0cc2c5ecd..aa2e26a3d3 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -13,94 +12,66 @@ public class ModelData extends Entity { @ObfuscatedName("aq") static int field1605; @ObfuscatedName("al") - @Export("ModelData_sine") static int[] ModelData_sine; @ObfuscatedName("ah") - @Export("ModelData_cosine") static int[] ModelData_cosine; @ObfuscatedName("z") - @Export("verticesCount") int verticesCount; @ObfuscatedName("k") - @Export("verticesX") int[] verticesX; @ObfuscatedName("s") - @Export("verticesY") int[] verticesY; @ObfuscatedName("t") - @Export("verticesZ") int[] verticesZ; @ObfuscatedName("i") - @Export("faceCount") int faceCount; @ObfuscatedName("o") - @Export("indices1") int[] indices1; @ObfuscatedName("x") - @Export("indices2") int[] indices2; @ObfuscatedName("w") - @Export("indices3") int[] indices3; @ObfuscatedName("g") - @Export("faceRenderTypes") byte[] faceRenderTypes; @ObfuscatedName("m") - @Export("faceRenderPriorities") byte[] faceRenderPriorities; @ObfuscatedName("n") - @Export("faceAlphas") byte[] faceAlphas; @ObfuscatedName("d") - @Export("textureCoords") byte[] textureCoords; @ObfuscatedName("h") - @Export("faceColors") short[] faceColors; @ObfuscatedName("a") - @Export("faceTextures") short[] faceTextures; @ObfuscatedName("q") - @Export("priority") byte priority; @ObfuscatedName("c") - @Export("textureTriangleCount") int textureTriangleCount; @ObfuscatedName("f") - @Export("textureRenderTypes") byte[] textureRenderTypes; @ObfuscatedName("y") - @Export("texTriangleX") short[] texTriangleX; @ObfuscatedName("v") - @Export("texTriangleY") short[] texTriangleY; @ObfuscatedName("j") - @Export("texTriangleZ") short[] texTriangleZ; @ObfuscatedName("r") - @Export("vertexSkins") int[] vertexSkins; @ObfuscatedName("u") - @Export("faceSkins") int[] faceSkins; @ObfuscatedName("p") - @Export("vertexLabels") int[][] vertexLabels; @ObfuscatedName("b") - @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "[Let;" ) - @Export("faceNormals") FaceNormal[] faceNormals; @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "[Leg;" ) - @Export("vertexNormals") VertexNormal[] vertexNormals; @ObfuscatedName("ab") @ObfuscatedSignature( @@ -108,13 +79,10 @@ public class ModelData extends Entity { ) VertexNormal[] field1599; @ObfuscatedName("ag") - @Export("ambient") public short ambient; @ObfuscatedName("ao") - @Export("contrast") public short contrast; @ObfuscatedName("ae") - @Export("isBoundsCalculated") boolean isBoundsCalculated; @ObfuscatedName("an") int field1598; @@ -1240,7 +1208,6 @@ public class ModelData extends Entity { } // L: 841 @ObfuscatedName("h") - @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 int[] var10000 = this.verticesX; // L: 845 @@ -1255,7 +1222,6 @@ public class ModelData extends Entity { } // L: 850 @ObfuscatedName("a") - @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 if (this.faceColors[var3] == var1) { // L: 854 @@ -1266,7 +1232,6 @@ public class ModelData extends Entity { } // L: 856 @ObfuscatedName("q") - @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 859 for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 860 @@ -1295,7 +1260,6 @@ public class ModelData extends Entity { } // L: 873 @ObfuscatedName("j") - @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 877 @@ -1307,7 +1271,6 @@ public class ModelData extends Entity { } // L: 882 @ObfuscatedName("r") - @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 885 this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 886 @@ -1383,7 +1346,6 @@ public class ModelData extends Entity { } // L: 940 @ObfuscatedName("u") - @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 943 this.field1599 = null; // L: 944 @@ -1392,7 +1354,6 @@ public class ModelData extends Entity { } // L: 947 @ObfuscatedName("p") - @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 950 super.height = 0; // L: 951 @@ -1439,7 +1400,6 @@ public class ModelData extends Entity { @ObfuscatedSignature( descriptor = "(IIIII)Ler;" ) - @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { this.calculateVertexNormals(); // L: 1028 int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1029 @@ -1626,7 +1586,6 @@ public class ModelData extends Entity { @ObfuscatedSignature( descriptor = "(Lic;II)Lee;" ) - @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 53 return var3 == null ? null : new ModelData(var3); // L: 54 diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 4f72b4b2af..21e5d3467f 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,6 +1,5 @@ import java.io.IOException; import java.net.Socket; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -17,13 +16,11 @@ public class ModelData0 { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("soundEffectsArchive") static AbstractArchive soundEffectsArchive; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("titlebuttonSprite") static IndexedSprite titlebuttonSprite; @ObfuscatedName("au") static String field1904; diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 6d2b74b6f9..7a410756e5 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -8,7 +8,6 @@ import java.awt.image.PixelGrabber; import java.io.ByteArrayInputStream; import java.io.IOException; import javax.imageio.ImageIO; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -21,109 +20,91 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @ObfuscatedGetter( intValue = 551932135 ) - @Export("MouseHandler_x") public static int MouseHandler_x; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lbe;" ) - @Export("MouseHandler_instance") static MouseHandler MouseHandler_instance; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1641634033 ) - @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1212010463 ) - @Export("MouseHandler_y") public static int MouseHandler_y; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 569317801 ) - @Export("MouseHandler_currentButtonVolatile") static volatile int MouseHandler_currentButtonVolatile; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 476051061 ) - @Export("MouseHandler_xVolatile") static volatile int MouseHandler_xVolatile; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1924891607 ) - @Export("MouseHandler_yVolatile") static volatile int MouseHandler_yVolatile; @ObfuscatedName("n") @ObfuscatedGetter( longValue = -5989118801596156891L ) - @Export("MouseHandler_lastMovedVolatile") static volatile long MouseHandler_lastMovedVolatile; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1364176147 ) - @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; @ObfuscatedName("h") @ObfuscatedGetter( longValue = 1548820219885674609L ) - @Export("MouseHandler_millis") public static long MouseHandler_millis; @ObfuscatedName("a") @ObfuscatedGetter( intValue = 1745887067 ) - @Export("MouseHandler_lastButtonVolatile") static volatile int MouseHandler_lastButtonVolatile; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 2031476779 ) - @Export("MouseHandler_lastPressedXVolatile") static volatile int MouseHandler_lastPressedXVolatile; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -604562201 ) - @Export("MouseHandler_lastPressedYVolatile") static volatile int MouseHandler_lastPressedYVolatile; @ObfuscatedName("f") @ObfuscatedGetter( longValue = -1684843054653501119L ) - @Export("MouseHandler_lastPressedTimeMillisVolatile") static volatile long MouseHandler_lastPressedTimeMillisVolatile; @ObfuscatedName("y") @ObfuscatedGetter( intValue = 376699801 ) - @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 1229832903 ) - @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -434332357 ) - @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; @ObfuscatedName("r") @ObfuscatedGetter( longValue = -2055163658116269707L ) - @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; @ObfuscatedName("fg") @ObfuscatedSignature( @@ -134,7 +115,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi @ObfuscatedGetter( intValue = 1280773695 ) - @Export("oculusOrbFocalPointY") static int oculusOrbFocalPointY; static { @@ -166,7 +146,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi descriptor = "(Ljava/awt/event/MouseEvent;B)I", garbageValue = "-11" ) - @Export("getButton") final int getButton(MouseEvent var1) { int var2 = var1.getButton(); // L: 72 if (!var1.isAltDown() && var2 != 2) { // L: 73 @@ -256,7 +235,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi descriptor = "([BI)Llp;", garbageValue = "1839748509" ) - @Export("convertJpgToSprite") public static final Sprite convertJpgToSprite(byte[] var0) { BufferedImage var1 = null; // L: 20 @@ -280,7 +258,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi descriptor = "(Lhq;IIII)V", garbageValue = "1755181117" ) - @Export("Widget_setKeyRate") static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { if (var0.field2682 == null) { // L: 926 throw new RuntimeException(); // L: 927 diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index f9ef1bc1db..1bd7cb0cd6 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,34 +15,26 @@ public class MouseRecorder implements Runnable { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive18") static Archive archive18; @ObfuscatedName("fc") @ObfuscatedSignature( descriptor = "Lfl;" ) - @Export("socketTask") static Task socketTask; @ObfuscatedName("z") - @Export("isRunning") boolean isRunning; @ObfuscatedName("k") - @Export("lock") Object lock; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -587598223 ) - @Export("index") int index; @ObfuscatedName("t") - @Export("xs") int[] xs; @ObfuscatedName("i") - @Export("ys") int[] ys; @ObfuscatedName("o") - @Export("millis") long[] millis; MouseRecorder() { @@ -74,7 +65,6 @@ public class MouseRecorder implements Runnable { descriptor = "(Lhq;IIZS)V", garbageValue = "338" ) - @Export("alignWidgetSize") static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { int var4 = var0.width; // L: 9242 int var5 = var0.height; // L: 9243 diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index d92b5dfe35..5b7bd16354 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,6 +10,5 @@ public interface MouseWheel { descriptor = "(I)I", garbageValue = "1668209919" ) - @Export("useRotation") int useRotation(); } diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index c17ddf6e05..d83f6a059b 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -1,7 +1,6 @@ import java.awt.Component; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,7 +13,6 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { @ObfuscatedGetter( intValue = 1614539885 ) - @Export("rotation") int rotation; MouseWheelHandler() { @@ -26,7 +24,6 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { descriptor = "(Ljava/awt/Component;I)V", garbageValue = "1793602712" ) - @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 @@ -36,7 +33,6 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { descriptor = "(Ljava/awt/Component;I)V", garbageValue = "-1289798046" ) - @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 @@ -46,7 +42,6 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { descriptor = "(I)I", garbageValue = "1668209919" ) - @Export("useRotation") public synchronized int useRotation() { int var1 = this.rotation; // L: 26 this.rotation = 0; // L: 27 diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 9f12809cce..28d10b4dcc 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,7 +15,6 @@ public class MusicPatch extends Node { @ObfuscatedSignature( descriptor = "[Lde;" ) - @Export("rawSounds") RawSound[] rawSounds; @ObfuscatedName("s") short[] field2510; @@ -527,7 +525,6 @@ public class MusicPatch extends Node { descriptor = "(S)V", garbageValue = "25153" ) - @Export("clear") void clear() { this.field2512 = null; // L: 321 } // L: 322 @@ -537,7 +534,6 @@ public class MusicPatch extends Node { descriptor = "(Lhq;I)Z", garbageValue = "-2027629220" ) - @Export("runCs1") static final boolean runCs1(Widget var0) { if (var0.cs1Comparisons == null) { // L: 9332 return false; diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 5c56ed48fa..c33c4fc007 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class MusicPatchNode extends Node { @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("worldSelectArrows") static IndexedSprite[] worldSelectArrows; @ObfuscatedName("z") @ObfuscatedGetter( @@ -22,13 +20,11 @@ public class MusicPatchNode extends Node { @ObfuscatedSignature( descriptor = "Lhx;" ) - @Export("patch") MusicPatch patch; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lde;" ) - @Export("rawSound") RawSound rawSound; @ObfuscatedName("t") @ObfuscatedSignature( @@ -109,7 +105,6 @@ public class MusicPatchNode extends Node { @ObfuscatedSignature( descriptor = "Ldm;" ) - @Export("stream") RawPcmStream stream; @ObfuscatedName("j") @ObfuscatedGetter( @@ -163,7 +158,6 @@ public class MusicPatchNode extends Node { descriptor = "(Ljava/lang/String;B)V", garbageValue = "-27" ) - @Export("Clan_joinChat") static final void Clan_joinChat(String var0) { if (!var0.equals("")) { // L: 10695 PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 10697 diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index aa47b2880b..88c318f07a 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class MusicPatchNode2 { @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("options_buttons_2Sprite") static IndexedSprite options_buttons_2Sprite; @ObfuscatedName("z") byte[] field2426; diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 518af23b56..17f8a1181a 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -15,19 +14,16 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "Lge;" ) - @Export("superStream") MidiPcmStream superStream; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("queue") NodeDeque queue; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Ldh;" ) - @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( @@ -122,7 +118,6 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 if (var1 == null) { // L: 20 @@ -136,7 +131,6 @@ public class MusicPatchPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { @@ -155,7 +149,6 @@ public class MusicPatchPcmStream extends PcmStream { } @ObfuscatedName("g") - @Export("fill") protected void fill(int[] var1, int var2, int var3) { this.mixer.fill(var1, var2, var3); // L: 40 @@ -181,7 +174,6 @@ public class MusicPatchPcmStream extends PcmStream { } // L: 54 @ObfuscatedName("n") - @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); // L: 58 @@ -209,7 +201,6 @@ public class MusicPatchPcmStream extends PcmStream { descriptor = "(II)Liq;", garbageValue = "-367277844" ) - @Export("getInvDefinition") public static InvDefinition getInvDefinition(int var0) { InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 if (var1 != null) { // L: 22 diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 63ef5338f0..6c124afc5a 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,10 +9,8 @@ public class MusicTrack extends Node { @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("table") NodeHashTable table; @ObfuscatedName("k") - @Export("midi") byte[] midi; @ObfuscatedSignature( @@ -417,7 +414,6 @@ public class MusicTrack extends Node { } // L: 331 @ObfuscatedName("s") - @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 @@ -426,7 +422,6 @@ public class MusicTrack extends Node { @ObfuscatedSignature( descriptor = "(Lic;II)Lhj;" ) - @Export("readTrack") static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 16 return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index ceca11c199..236aee5038 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,7 +9,6 @@ public final class NPC extends Actor { @ObfuscatedSignature( descriptor = "Ljx;" ) - @Export("definition") NPCDefinition definition; NPC() { @@ -124,7 +122,6 @@ public final class NPC extends Actor { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected final Model getModel() { if (this.definition == null) { // L: 77 return null; @@ -160,7 +157,6 @@ public final class NPC extends Actor { descriptor = "(I)Z", garbageValue = "68470795" ) - @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 97 } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index c4272967ba..ac980f0bb5 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,43 +10,35 @@ public class NPCDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("NpcDefinition_cached") public static EvictingDualNodeHashTable NpcDefinition_cached; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("NpcDefinition_cachedModels") public static EvictingDualNodeHashTable NpcDefinition_cachedModels; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -851756363 ) - @Export("id") public int id; @ObfuscatedName("o") - @Export("name") public String name; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1762851059 ) - @Export("size") public int size; @ObfuscatedName("w") - @Export("models") int[] models; @ObfuscatedName("g") int[] field3492; @@ -55,136 +46,108 @@ public class NPCDefinition extends DualNode { @ObfuscatedGetter( intValue = 594093455 ) - @Export("idleSequence") public int idleSequence; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1970335799 ) - @Export("turnLeftSequence") public int turnLeftSequence; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 136881499 ) - @Export("turnRightSequence") public int turnRightSequence; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -1497603669 ) - @Export("walkSequence") public int walkSequence; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1405079749 ) - @Export("walkBackSequence") public int walkBackSequence; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -950124131 ) - @Export("walkLeftSequence") public int walkLeftSequence; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -1378189657 ) - @Export("walkRightSequence") public int walkRightSequence; @ObfuscatedName("f") - @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("y") - @Export("recolorTo") short[] recolorTo; @ObfuscatedName("v") - @Export("retextureFrom") short[] retextureFrom; @ObfuscatedName("j") - @Export("retextureTo") short[] retextureTo; @ObfuscatedName("r") - @Export("actions") public String[] actions; @ObfuscatedName("u") - @Export("drawMapDot") public boolean drawMapDot; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -442899961 ) - @Export("combatLevel") public int combatLevel; @ObfuscatedName("b") @ObfuscatedGetter( intValue = -337235261 ) - @Export("widthScale") int widthScale; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -541213457 ) - @Export("heightScale") int heightScale; @ObfuscatedName("e") - @Export("isVisible") public boolean isVisible; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = -888518163 ) - @Export("ambient") int ambient; @ObfuscatedName("ag") @ObfuscatedGetter( intValue = -405765695 ) - @Export("contrast") int contrast; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = -1421208063 ) - @Export("headIconPrayer") public int headIconPrayer; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 754705433 ) - @Export("rotation") public int rotation; @ObfuscatedName("an") - @Export("transforms") public int[] transforms; @ObfuscatedName("am") @ObfuscatedGetter( intValue = -1534025905 ) - @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = -1959008785 ) - @Export("transformVarp") int transformVarp; @ObfuscatedName("au") - @Export("isInteractable") public boolean isInteractable; @ObfuscatedName("aa") - @Export("isClickable") public boolean isClickable; @ObfuscatedName("ar") - @Export("isFollower") public boolean isFollower; @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("params") IterableNodeHashTable params; static { @@ -224,7 +187,6 @@ public class NPCDefinition extends DualNode { descriptor = "(I)V", garbageValue = "-1451445441" ) - @Export("postDecode") void postDecode() { } // L: 68 @@ -233,7 +195,6 @@ public class NPCDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "289970781" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 72 @@ -250,7 +211,6 @@ public class NPCDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-1568291099" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; @@ -375,7 +335,6 @@ public class NPCDefinition extends DualNode { descriptor = "(Ljm;ILjm;IB)Ler;", garbageValue = "112" ) - @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.transforms != null) { // L: 158 NPCDefinition var12 = this.transform(); // L: 159 @@ -449,7 +408,6 @@ public class NPCDefinition extends DualNode { descriptor = "(I)Lee;", garbageValue = "1421247419" ) - @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { // L: 196 NPCDefinition var7 = this.transform(); // L: 197 @@ -504,7 +462,6 @@ public class NPCDefinition extends DualNode { descriptor = "(I)Ljx;", garbageValue = "795812200" ) - @Export("transform") public final NPCDefinition transform() { int var1 = -1; // L: 224 if (this.transformVarbit != -1) { // L: 225 @@ -528,7 +485,6 @@ public class NPCDefinition extends DualNode { descriptor = "(I)Z", garbageValue = "140148621" ) - @Export("transformIsVisible") public boolean transformIsVisible() { if (this.transforms == null) { // L: 235 return true; @@ -553,7 +509,6 @@ public class NPCDefinition extends DualNode { descriptor = "(III)I", garbageValue = "1359705510" ) - @Export("getIntParam") public int getIntParam(int var1, int var2) { return Username.method5309(this.params, var1, var2); // L: 244 } @@ -563,7 +518,6 @@ public class NPCDefinition extends DualNode { descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", garbageValue = "77" ) - @Export("getStringParam") public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; // L: 249 String var3; diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index b38edb2b10..c737a0cd73 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class NanoClock extends Clock { @ObfuscatedGetter( longValue = -6496299108672843091L ) - @Export("lastTimeNano") long lastTimeNano; NanoClock() { @@ -23,7 +21,6 @@ public class NanoClock extends Clock { descriptor = "(I)V", garbageValue = "208275261" ) - @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 @@ -33,7 +30,6 @@ public class NanoClock extends Clock { descriptor = "(III)I", garbageValue = "-16016139" ) - @Export("wait") public int wait(int var1, int var2) { long var3 = 1000000L * (long)var2; // L: 18 long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index e67a958cff..606e18789f 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,5 +1,4 @@ import java.util.zip.CRC32; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,13 +11,11 @@ public class NetCache { @ObfuscatedSignature( descriptor = "Lln;" ) - @Export("NetCache_socket") public static AbstractSocket NetCache_socket; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 570306795 ) - @Export("NetCache_loadTime") static int NetCache_loadTime; @ObfuscatedName("s") @ObfuscatedGetter( @@ -29,61 +26,51 @@ public class NetCache { @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("NetCache_pendingPriorityWrites") static NodeHashTable NetCache_pendingPriorityWrites; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1894418175 ) - @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("NetCache_pendingPriorityResponses") static NodeHashTable NetCache_pendingPriorityResponses; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 994594523 ) - @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Ljl;" ) - @Export("NetCache_pendingWritesQueue") static DualNodeDeque NetCache_pendingWritesQueue; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("NetCache_pendingWrites") static NodeHashTable NetCache_pendingWrites; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1420450011 ) - @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("NetCache_pendingResponses") static NodeHashTable NetCache_pendingResponses; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -1710151389 ) - @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Lkf;" ) - @Export("NetCache_responseHeaderBuffer") static Buffer NetCache_responseHeaderBuffer; @ObfuscatedName("f") @ObfuscatedGetter( @@ -91,13 +78,11 @@ public class NetCache { ) static int field3205; @ObfuscatedName("v") - @Export("NetCache_crc") static CRC32 NetCache_crc; @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "[Liw;" ) - @Export("NetCache_archives") static Archive[] NetCache_archives; @ObfuscatedName("u") static byte field3208; @@ -105,13 +90,11 @@ public class NetCache { @ObfuscatedGetter( intValue = 888421105 ) - @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; @ObfuscatedName("b") @ObfuscatedGetter( intValue = -1735021825 ) - @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; static { diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 2f8569a1fa..ee63192511 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,22 +10,18 @@ public class NetFileRequest extends DualNode { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive2") static Archive archive2; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive") Archive archive; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1779411329 ) - @Export("crc") int crc; @ObfuscatedName("s") - @Export("padding") byte padding; NetFileRequest() { diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 7ce35ff1d1..8cb96d6f49 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,61 +15,48 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedSignature( descriptor = "Llb;" ) - @Export("spriteIds") static GraphicsDefaults spriteIds; @ObfuscatedName("z") - @Export("inputStream") InputStream inputStream; @ObfuscatedName("k") - @Export("outputStream") OutputStream outputStream; @ObfuscatedName("s") - @Export("socket") Socket socket; @ObfuscatedName("t") - @Export("isClosed") boolean isClosed; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lfo;" ) - @Export("taskHandler") TaskHandler taskHandler; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lfl;" ) - @Export("task") Task task; @ObfuscatedName("x") - @Export("outBuffer") byte[] outBuffer; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -43739121 ) - @Export("outLength") int outLength; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1877498573 ) - @Export("outOffset") int outOffset; @ObfuscatedName("m") - @Export("exceptionWriting") boolean exceptionWriting; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1318092279 ) - @Export("bufferLength") final int bufferLength; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 202627819 ) - @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( @@ -98,7 +84,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(I)V", garbageValue = "-147773206" ) - @Export("close") public void close() { if (!this.isClosed) { // L: 41 synchronized(this) { // L: 42 @@ -128,7 +113,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(B)I", garbageValue = "-99" ) - @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } @@ -138,7 +122,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(B)I", garbageValue = "12" ) - @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } @@ -148,7 +131,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(IB)Z", garbageValue = "-78" ) - @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { if (this.isClosed) { // L: 75 return false; @@ -162,7 +144,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "([BIII)I", garbageValue = "-1533815985" ) - @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { if (this.isClosed) { // L: 80 return 0; @@ -187,7 +168,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "([BIII)V", garbageValue = "-588582807" ) - @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { if (!this.isClosed) { // L: 92 if (this.exceptionWriting) { // L: 93 @@ -222,7 +202,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "([BIIB)V", garbageValue = "52" ) - @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.write0(var1, var2, var3); // L: 160 } // L: 161 @@ -308,7 +287,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(II)Ljj;", garbageValue = "2080665133" ) - @Export("StructDefinition_getStructDefinition") public static StructDefinition StructDefinition_getStructDefinition(int var0) { StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); // L: 23 if (var1 != null) { // L: 24 @@ -364,7 +342,6 @@ public final class NetSocket extends AbstractSocket implements Runnable { descriptor = "(Lhq;I[B[BI)V", garbageValue = "-421721574" ) - @Export("Widget_setKey") static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { if (var0.field2626 == null) { // L: 902 if (var2 == null) { // L: 903 diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 090f2ea20f..951e4492d7 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,23 +6,19 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Node") public class Node { @ObfuscatedName("cp") - @Export("key") public long key; @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("previous") public Node previous; @ObfuscatedName("cs") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("next") public Node next; @ObfuscatedName("fa") - @Export("remove") public void remove() { if (this.next != null) { // L: 9 this.next.previous = this.previous; // L: 10 @@ -34,7 +29,6 @@ public class Node { } // L: 14 @ObfuscatedName("fh") - @Export("hasNext") public boolean hasNext() { return this.next != null; // L: 17 } diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index b1a9e4e0f9..a4aa5c6879 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("sentinel") public Node sentinel; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("current") Node current; public NodeDeque() { @@ -26,7 +23,6 @@ public class NodeDeque { } // L: 12 @ObfuscatedName("z") - @Export("clear") public void clear() { while (true) { Node var1 = this.sentinel.previous; // L: 16 @@ -43,7 +39,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "(Lgw;)V" ) - @Export("addFirst") public void addFirst(Node var1) { if (var1.next != null) { // L: 24 var1.remove(); @@ -59,7 +54,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "(Lgw;)V" ) - @Export("addLast") public void addLast(Node var1) { if (var1.next != null) { // L: 32 var1.remove(); @@ -75,7 +69,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("removeLast") public Node removeLast() { Node var1 = this.sentinel.previous; // L: 48 if (var1 == this.sentinel) { @@ -90,7 +83,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("removeFirst") public Node removeFirst() { Node var1 = this.sentinel.next; // L: 55 if (var1 == this.sentinel) { @@ -105,7 +97,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("last") public Node last() { Node var1 = this.sentinel.previous; // L: 62 if (var1 == this.sentinel) { // L: 63 @@ -121,7 +112,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("first") public Node first() { Node var1 = this.sentinel.next; // L: 72 if (var1 == this.sentinel) { // L: 73 @@ -137,7 +127,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("previous") public Node previous() { Node var1 = this.current; // L: 82 if (var1 == this.sentinel) { // L: 83 @@ -153,7 +142,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("next") public Node next() { Node var1 = this.current; // L: 92 if (var1 == this.sentinel) { // L: 93 @@ -169,7 +157,6 @@ public class NodeDeque { @ObfuscatedSignature( descriptor = "(Lgw;Lgw;)V" ) - @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { if (var0.next != null) { // L: 40 var0.remove(); diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 0d20533df9..ca0d08dfdd 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,28 +6,23 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("NodeHashTable") public final class NodeHashTable { @ObfuscatedName("z") - @Export("size") int size; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "[Lgw;" ) - @Export("buckets") Node[] buckets; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("currentGet") Node currentGet; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lgw;" ) - @Export("current") Node current; @ObfuscatedName("i") - @Export("index") int index; public NodeHashTable(int var1) { @@ -48,7 +42,6 @@ public final class NodeHashTable { @ObfuscatedSignature( descriptor = "(J)Lgw;" ) - @Export("get") public Node get(long var1) { Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 23 @@ -68,7 +61,6 @@ public final class NodeHashTable { @ObfuscatedSignature( descriptor = "(Lgw;J)V" ) - @Export("put") public void put(Node var1, long var2) { if (var1.next != null) { // L: 38 var1.remove(); @@ -86,7 +78,6 @@ public final class NodeHashTable { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("first") public Node first() { this.index = 0; // L: 48 return this.next(); // L: 49 @@ -96,7 +87,6 @@ public final class NodeHashTable { @ObfuscatedSignature( descriptor = "()Lgw;" ) - @Export("next") public Node next() { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 53 diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 2574bb9ed6..2df54d98b2 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,43 +7,36 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { @ObfuscatedName("z") - @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -316763003 ) - @Export("RunException_revision") public static int RunException_revision; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ObjectDefinition_cached") static EvictingDualNodeHashTable ObjectDefinition_cached; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ObjectDefinition_cachedEntities") static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ObjectDefinition_cachedModels") static EvictingDualNodeHashTable ObjectDefinition_cachedModels; @ObfuscatedName("w") @ObfuscatedSignature( @@ -55,208 +47,165 @@ public class ObjectDefinition extends DualNode { @ObfuscatedGetter( intValue = 1213282055 ) - @Export("id") public int id; @ObfuscatedName("m") - @Export("modelIds") int[] modelIds; @ObfuscatedName("n") - @Export("models") int[] models; @ObfuscatedName("d") - @Export("name") public String name; @ObfuscatedName("h") - @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("a") - @Export("recolorTo") short[] recolorTo; @ObfuscatedName("q") - @Export("retextureFrom") short[] retextureFrom; @ObfuscatedName("c") - @Export("retextureTo") short[] retextureTo; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1077626397 ) - @Export("sizeX") public int sizeX; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -2025374519 ) - @Export("sizeY") public int sizeY; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 890541759 ) - @Export("interactType") public int interactType; @ObfuscatedName("j") - @Export("boolean1") public boolean boolean1; @ObfuscatedName("r") @ObfuscatedGetter( intValue = -372778753 ) - @Export("int1") public int int1; @ObfuscatedName("u") @ObfuscatedGetter( intValue = 1406792895 ) - @Export("clipType") int clipType; @ObfuscatedName("p") - @Export("nonFlatShading") boolean nonFlatShading; @ObfuscatedName("b") - @Export("modelClipped") public boolean modelClipped; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1020675379 ) - @Export("animationId") public int animationId; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 926776109 ) - @Export("int2") public int int2; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = 1365611553 ) - @Export("ambient") int ambient; @ObfuscatedName("ag") @ObfuscatedGetter( intValue = -1927272841 ) - @Export("contrast") int contrast; @ObfuscatedName("ao") - @Export("actions") public String[] actions; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 668674641 ) - @Export("mapIconId") public int mapIconId; @ObfuscatedName("an") @ObfuscatedGetter( intValue = -889777445 ) - @Export("mapSceneId") public int mapSceneId; @ObfuscatedName("am") - @Export("isRotated") boolean isRotated; @ObfuscatedName("ap") - @Export("clipped") public boolean clipped; @ObfuscatedName("au") @ObfuscatedGetter( intValue = -772733315 ) - @Export("modelSizeX") int modelSizeX; @ObfuscatedName("aa") @ObfuscatedGetter( intValue = 616774407 ) - @Export("modelHeight") int modelHeight; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = 967285395 ) - @Export("modelSizeY") int modelSizeY; @ObfuscatedName("at") @ObfuscatedGetter( intValue = 574968885 ) - @Export("offsetX") int offsetX; @ObfuscatedName("aq") @ObfuscatedGetter( intValue = 1686483135 ) - @Export("offsetHeight") int offsetHeight; @ObfuscatedName("al") @ObfuscatedGetter( intValue = 1033480045 ) - @Export("offsetY") int offsetY; @ObfuscatedName("ah") - @Export("boolean2") public boolean boolean2; @ObfuscatedName("av") - @Export("isSolid") boolean isSolid; @ObfuscatedName("ax") @ObfuscatedGetter( intValue = -1249127107 ) - @Export("int3") public int int3; @ObfuscatedName("as") - @Export("transforms") public int[] transforms; @ObfuscatedName("az") @ObfuscatedGetter( intValue = -654003283 ) - @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = 528036607 ) - @Export("transformVarp") int transformVarp; @ObfuscatedName("ai") @ObfuscatedGetter( intValue = -241145981 ) - @Export("ambientSoundId") public int ambientSoundId; @ObfuscatedName("ay") @ObfuscatedGetter( intValue = 719354007 ) - @Export("int4") public int int4; @ObfuscatedName("aj") @ObfuscatedGetter( intValue = -402900319 ) - @Export("int5") public int int5; @ObfuscatedName("aw") @ObfuscatedGetter( intValue = 1265456877 ) - @Export("int6") public int int6; @ObfuscatedName("af") - @Export("soundEffectIds") public int[] soundEffectIds; @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("params") IterableNodeHashTable params; static { @@ -309,7 +258,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(I)V", garbageValue = "1906131064" ) - @Export("postDecode") void postDecode() { if (this.int1 == -1) { // L: 88 this.int1 = 0; // L: 89 @@ -335,7 +283,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(Lkf;B)V", garbageValue = "81" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); @@ -352,7 +299,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "1904388143" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; @@ -555,7 +501,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(I)Z", garbageValue = "-1059534809" ) - @Export("needsModelFiles") public final boolean needsModelFiles() { if (this.modelIds == null) { // L: 242 return true; @@ -575,7 +520,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(II[[IIIIB)Lez;", garbageValue = "14" ) - @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if (this.models == null) { // L: 252 @@ -623,7 +567,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(II[[IIIIB)Ler;", garbageValue = "-34" ) - @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if (this.models == null) { // L: 279 @@ -655,7 +598,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(II[[IIIILjm;II)Ler;", garbageValue = "929962963" ) - @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { long var9; if (this.models == null) { // L: 294 @@ -697,7 +639,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(III)Lee;", garbageValue = "1848667865" ) - @Export("getModelData") final ModelData getModelData(int var1, int var2) { ModelData var3 = null; // L: 311 boolean var4; @@ -838,7 +779,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(I)Ljg;", garbageValue = "1360246605" ) - @Export("transform") public final ObjectDefinition transform() { int var1 = -1; // L: 383 if (this.transformVarbit != -1) { // L: 384 @@ -862,7 +802,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(IIB)I", garbageValue = "1" ) - @Export("getIntParam") public int getIntParam(int var1, int var2) { return Username.method5309(this.params, var1, var2); // L: 394 } @@ -872,7 +811,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", garbageValue = "1714990387" ) - @Export("getStringParam") public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; // L: 399 String var3; @@ -895,7 +833,6 @@ public class ObjectDefinition extends DualNode { descriptor = "(B)Z", garbageValue = "-95" ) - @Export("hasSound") public boolean hasSound() { if (this.transforms == null) { // L: 423 return this.ambientSoundId != -1 || this.soundEffectIds != null; diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index bb953a4ff0..d145d14b99 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,7 +5,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("ObjectNode") public class ObjectNode extends Node { @ObfuscatedName("z") - @Export("obj") public final Object obj; public ObjectNode(Object var1) { diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index f6d6f4b7d5..89369977b8 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public final class ObjectSound extends Node { @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("objectSounds") static NodeDeque objectSounds; @ObfuscatedName("z") @ObfuscatedGetter( @@ -27,19 +25,16 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = -2039655179 ) - @Export("plane") int plane; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1121925225 ) - @Export("x") int x; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1814534079 ) - @Export("y") int y; @ObfuscatedName("x") @ObfuscatedGetter( @@ -55,13 +50,11 @@ public final class ObjectSound extends Node { @ObfuscatedGetter( intValue = -34287423 ) - @Export("soundEffectId") int soundEffectId; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Ldm;" ) - @Export("stream1") RawPcmStream stream1; @ObfuscatedName("n") @ObfuscatedGetter( @@ -69,7 +62,6 @@ public final class ObjectSound extends Node { ) int field1115; @ObfuscatedName("d") - @Export("soundEffectIds") int[] soundEffectIds; @ObfuscatedName("h") @ObfuscatedGetter( @@ -80,13 +72,11 @@ public final class ObjectSound extends Node { @ObfuscatedSignature( descriptor = "Ldm;" ) - @Export("stream2") RawPcmStream stream2; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Ljg;" ) - @Export("obj") ObjectDefinition obj; static { @@ -101,7 +91,6 @@ public final class ObjectSound extends Node { descriptor = "(S)V", garbageValue = "23141" ) - @Export("set") void set() { int var1 = this.soundEffectId; ObjectDefinition var2 = this.obj.transform(); diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index cb84d41091..fbd1909611 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public final class Occluder { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive10") static Archive archive10; @ObfuscatedName("le") @ObfuscatedSignature( @@ -22,67 +20,56 @@ public final class Occluder { @ObfuscatedGetter( intValue = 299619711 ) - @Export("minTileX") int minTileX; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1317670669 ) - @Export("maxTileX") int maxTileX; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -322147255 ) - @Export("minTileY") int minTileY; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -2083623235 ) - @Export("maxTileY") int maxTileY; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 2131844695 ) - @Export("type") int type; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -453208547 ) - @Export("minX") int minX; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -985593835 ) - @Export("maxX") int maxX; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1472483077 ) - @Export("minZ") int minZ; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 459569369 ) - @Export("maxZ") int maxZ; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -2090994579 ) - @Export("minY") int minY; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1349976535 ) - @Export("maxY") int maxY; @ObfuscatedName("d") @ObfuscatedGetter( @@ -128,7 +115,6 @@ public final class Occluder { descriptor = "([BB)V", garbageValue = "-61" ) - @Export("SpriteBuffer_decode") static void SpriteBuffer_decode(byte[] var0) { Buffer var1 = new Buffer(var0); // L: 229 var1.offset = var0.length - 2; // L: 230 diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 99aef8feaa..1b0877a377 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -1,5 +1,4 @@ import java.awt.Image; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,19 +15,16 @@ public class PacketBuffer extends Buffer { @ObfuscatedGetter( intValue = 1400093691 ) - @Export("cameraPitch") static int cameraPitch; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Llh;" ) - @Export("isaacCipher") IsaacCipher isaacCipher; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1373505985 ) - @Export("bitIndex") int bitIndex; static { @@ -44,7 +40,6 @@ public class PacketBuffer extends Buffer { descriptor = "([II)V", garbageValue = "687379780" ) - @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 @@ -54,7 +49,6 @@ public class PacketBuffer extends Buffer { descriptor = "(Llh;I)V", garbageValue = "-1243349913" ) - @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 @@ -64,7 +58,6 @@ public class PacketBuffer extends Buffer { descriptor = "(II)V", garbageValue = "28692652" ) - @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 @@ -74,7 +67,6 @@ public class PacketBuffer extends Buffer { descriptor = "(B)I", garbageValue = "3" ) - @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } @@ -94,7 +86,6 @@ public class PacketBuffer extends Buffer { descriptor = "(B)I", garbageValue = "-121" ) - @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 37 return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 @@ -117,7 +108,6 @@ public class PacketBuffer extends Buffer { descriptor = "(I)V", garbageValue = "1646456009" ) - @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 @@ -127,7 +117,6 @@ public class PacketBuffer extends Buffer { descriptor = "(II)I", garbageValue = "606103556" ) - @Export("readBits") public int readBits(int var1) { int var2 = this.bitIndex >> 3; // L: 51 int var3 = 8 - (this.bitIndex & 7); // L: 52 @@ -152,7 +141,6 @@ public class PacketBuffer extends Buffer { descriptor = "(I)V", garbageValue = "2092208058" ) - @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 @@ -162,7 +150,6 @@ public class PacketBuffer extends Buffer { descriptor = "(IS)I", garbageValue = "-20679" ) - @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; // L: 70 } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index c0398abb3e..026d5a2c77 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,37 +10,31 @@ public class PacketBufferNode extends Node { @ObfuscatedSignature( descriptor = "[Lgb;" ) - @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 110077839 ) - @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lgf;" ) - @Export("clientPacket") ClientPacket clientPacket; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1747169149 ) - @Export("clientPacketLength") int clientPacketLength; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lky;" ) - @Export("packetBuffer") public PacketBuffer packetBuffer; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1051886947 ) - @Export("index") public int index; static { @@ -57,7 +50,6 @@ public class PacketBufferNode extends Node { descriptor = "(I)V", garbageValue = "-1940555210" ) - @Export("release") public void release() { if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 50 PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 51 @@ -81,7 +73,6 @@ public class PacketBufferNode extends Node { descriptor = "(Ldc;B)V", garbageValue = "1" ) - @Export("PcmStream_disable") static final void PcmStream_disable(PcmStream var0) { var0.active = false; // L: 266 if (var0.sound != null) { // L: 267 diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 3106627ab6..9d60534484 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -1,5 +1,4 @@ import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,49 +13,41 @@ public class PacketWriter { @ObfuscatedSignature( descriptor = "Lln;" ) - @Export("socket") AbstractSocket socket; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Ljv;" ) - @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1900413985 ) - @Export("bufferSize") int bufferSize; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lkf;" ) - @Export("buffer") Buffer buffer; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Llh;" ) - @Export("isaacCipher") public IsaacCipher isaacCipher; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lky;" ) - @Export("packetBuffer") PacketBuffer packetBuffer; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lga;" ) - @Export("serverPacket") ServerPacket serverPacket; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1678952517 ) - @Export("serverPacketLength") int serverPacketLength; @ObfuscatedName("g") boolean field1344; @@ -69,7 +60,6 @@ public class PacketWriter { @ObfuscatedGetter( intValue = 2009057559 ) - @Export("pendingWrites") int pendingWrites; @ObfuscatedName("d") @ObfuscatedSignature( @@ -104,7 +94,6 @@ public class PacketWriter { descriptor = "(I)V", garbageValue = "-256200238" ) - @Export("clearBuffer") final void clearBuffer() { this.packetBufferNodes.rsClear(); // L: 32 this.bufferSize = 0; // L: 33 @@ -115,7 +104,6 @@ public class PacketWriter { descriptor = "(I)V", garbageValue = "-1276124374" ) - @Export("flush") final void flush() throws IOException { if (this.socket != null && this.bufferSize > 0) { // L: 37 this.buffer.offset = 0; // L: 38 @@ -143,7 +131,6 @@ public class PacketWriter { descriptor = "(Lgb;I)V", garbageValue = "1906163027" ) - @Export("addNode") public final void addNode(PacketBufferNode var1) { this.packetBufferNodes.addFirst(var1); var1.index = var1.packetBuffer.offset; // L: 56 @@ -156,7 +143,6 @@ public class PacketWriter { descriptor = "(Lln;I)V", garbageValue = "-666263315" ) - @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; // L: 62 } // L: 63 @@ -166,7 +152,6 @@ public class PacketWriter { descriptor = "(I)V", garbageValue = "2058968107" ) - @Export("close") void close() { if (this.socket != null) { // L: 66 this.socket.close(); // L: 67 @@ -180,7 +165,6 @@ public class PacketWriter { descriptor = "(B)V", garbageValue = "-102" ) - @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 @@ -190,7 +174,6 @@ public class PacketWriter { descriptor = "(B)Lln;", garbageValue = "43" ) - @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } @@ -200,7 +183,6 @@ public class PacketWriter { descriptor = "(B)J", garbageValue = "-123" ) - @Export("currentTimeMillis") public static final synchronized long currentTimeMillis() { long var0 = System.currentTimeMillis(); // L: 14 if (var0 < class306.field3723) { // L: 15 @@ -216,7 +198,6 @@ public class PacketWriter { descriptor = "(Lkf;Llq;I)Llq;", garbageValue = "309027289" ) - @Export("readStringIntParameters") static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { int var2 = var0.readUnsignedByte(); // L: 16 int var3; @@ -273,7 +254,6 @@ public class PacketWriter { descriptor = "(II)V", garbageValue = "82642187" ) - @Export("Widget_resetModelFrames") static final void Widget_resetModelFrames(int var0) { if (WorldMapSprite.loadInterface(var0)) { // L: 10286 Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 10287 diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index b9277d65fb..daaebe3472 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,28 +10,22 @@ public class ParamDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("ParamDefinition_archive") public static AbstractArchive ParamDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("ParamDefinition_cached") static EvictingDualNodeHashTable ParamDefinition_cached; @ObfuscatedName("s") - @Export("type") char type; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 2056477959 ) - @Export("defaultInt") public int defaultInt; @ObfuscatedName("i") - @Export("defaultStr") public String defaultStr; @ObfuscatedName("o") - @Export("autoDisable") boolean autoDisable; static { @@ -48,7 +41,6 @@ public class ParamDefinition extends DualNode { descriptor = "(I)V", garbageValue = "964888854" ) - @Export("postDecode") void postDecode() { } // L: 31 @@ -57,7 +49,6 @@ public class ParamDefinition extends DualNode { descriptor = "(Lkf;B)V", garbageValue = "2" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 35 @@ -74,7 +65,6 @@ public class ParamDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "-659243660" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 42 byte var4 = var1.readByte(); // L: 44 @@ -109,7 +99,6 @@ public class ParamDefinition extends DualNode { descriptor = "(I)Z", garbageValue = "937250031" ) - @Export("isString") public boolean isString() { return this.type == 's'; // L: 64 } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 982e953496..37de62dd4f 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,5 +1,4 @@ import java.util.concurrent.ScheduledExecutorService; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,10 +13,8 @@ public class PcmPlayer { ) public static int field1447; @ObfuscatedName("o") - @Export("PcmPlayer_stereo") protected static boolean PcmPlayer_stereo; @ObfuscatedName("w") - @Export("soundSystemExecutor") static ScheduledExecutorService soundSystemExecutor; @ObfuscatedName("fb") @ObfuscatedGetter( @@ -25,13 +22,11 @@ public class PcmPlayer { ) static long field1430; @ObfuscatedName("a") - @Export("samples") protected int[] samples; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Ldc;" ) - @Export("stream") PcmStream stream; @ObfuscatedName("c") @ObfuscatedGetter( @@ -42,13 +37,11 @@ public class PcmPlayer { @ObfuscatedGetter( longValue = -2930435928401446917L ) - @Export("timeMs") long timeMs; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -149687327 ) - @Export("capacity") int capacity; @ObfuscatedName("v") @ObfuscatedGetter( @@ -122,7 +115,6 @@ public class PcmPlayer { descriptor = "(I)V", garbageValue = "-841767260" ) - @Export("init") protected void init() throws Exception { } // L: 280 @@ -131,7 +123,6 @@ public class PcmPlayer { descriptor = "(IB)V", garbageValue = "-120" ) - @Export("open") protected void open(int var1) throws Exception { } // L: 281 @@ -140,13 +131,11 @@ public class PcmPlayer { descriptor = "(B)I", garbageValue = "106" ) - @Export("position") protected int position() throws Exception { return this.capacity; // L: 284 } @ObfuscatedName("t") - @Export("write") protected void write() throws Exception { } // L: 287 @@ -155,7 +144,6 @@ public class PcmPlayer { descriptor = "(I)V", garbageValue = "667465439" ) - @Export("close") protected void close() { } // L: 288 @@ -164,7 +152,6 @@ public class PcmPlayer { descriptor = "(I)V", garbageValue = "-2027971398" ) - @Export("discard") protected void discard() throws Exception { } // L: 289 @@ -173,7 +160,6 @@ public class PcmPlayer { descriptor = "(Ldc;I)V", garbageValue = "35825022" ) - @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; // L: 79 } // L: 80 @@ -183,7 +169,6 @@ public class PcmPlayer { descriptor = "(I)V", garbageValue = "-1677504744" ) - @Export("run") public final synchronized void run() { if (this.samples != null) { // L: 83 long var1 = PacketWriter.currentTimeMillis(); // L: 84 @@ -285,7 +270,6 @@ public class PcmPlayer { descriptor = "(I)V", garbageValue = "30633041" ) - @Export("tryDiscard") public final synchronized void tryDiscard() { this.field1445 = true; // L: 150 @@ -303,7 +287,6 @@ public class PcmPlayer { descriptor = "(I)V", garbageValue = "2048322330" ) - @Export("shutdown") public final synchronized void shutdown() { if (class1.soundSystem != null) { // L: 161 boolean var1 = true; // L: 162 @@ -334,7 +317,6 @@ public class PcmPlayer { descriptor = "(II)V", garbageValue = "2014217671" ) - @Export("skip") final void skip(int var1) { this.field1441 -= var1; // L: 178 if (this.field1441 < 0) { @@ -348,7 +330,6 @@ public class PcmPlayer { } // L: 181 @ObfuscatedName("au") - @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; // L: 185 if (PcmPlayer_stereo) { // L: 186 diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index aedeb26fbc..dd0ccdf547 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,13 +6,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") - @Export("active") volatile boolean active; @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Ldc;" ) - @Export("after") PcmStream after; @ObfuscatedName("y") int field1519; @@ -21,7 +18,6 @@ public abstract class PcmStream extends Node { @ObfuscatedSignature( descriptor = "Ldp;" ) - @Export("sound") AbstractSound sound; protected PcmStream() { @@ -32,25 +28,21 @@ public abstract class PcmStream extends Node { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("firstSubStream") protected abstract PcmStream firstSubStream(); @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("nextSubStream") protected abstract PcmStream nextSubStream(); @ObfuscatedName("w") protected abstract int vmethod3987(); @ObfuscatedName("g") - @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); @ObfuscatedName("n") - @Export("skip") protected abstract void skip(int var1); @ObfuscatedName("aw") @@ -59,7 +51,6 @@ public abstract class PcmStream extends Node { } @ObfuscatedName("fd") - @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 this.fill(var1, var2, var3); diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index ddc254701a..fc805da8a1 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,7 +9,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("subStreams") NodeDeque subStreams; @ObfuscatedName("k") @ObfuscatedSignature( @@ -33,7 +31,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( descriptor = "(Ldc;)V" ) - @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 @@ -42,7 +39,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( descriptor = "(Ldc;)V" ) - @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 @@ -93,7 +89,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } @@ -102,7 +97,6 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } @@ -113,7 +107,6 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("g") - @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { if (this.field1368 < 0) { // L: 60 @@ -149,7 +142,6 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("m") - @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 var4.update(var1, var2, var3); // L: 93 @@ -158,7 +150,6 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 @ObfuscatedName("n") - @Export("skip") public final synchronized void skip(int var1) { do { if (this.field1368 < 0) { // L: 99 @@ -193,7 +184,6 @@ public class PcmStreamMixer extends PcmStream { } @ObfuscatedName("d") - @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 var2.skip(var1); // L: 131 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index fa1ac88a6d..41c5ef7a3c 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public abstract class PcmStreamMixerListener extends Node { int field1476; @ObfuscatedName("z") - @Export("remove2") abstract void remove2(); @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(Ldh;)I" ) - @Export("update") abstract int update(); } diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 5949fcd78a..af61a24a15 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,31 +11,26 @@ public final class PendingSpawn extends Node { @ObfuscatedGetter( intValue = -1658510555 ) - @Export("objectId") int objectId; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 537531937 ) - @Export("plane") int plane; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -451639577 ) - @Export("type") int type; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -805517653 ) - @Export("x") int x; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 309622261 ) - @Export("y") int y; @ObfuscatedName("o") @ObfuscatedGetter( @@ -52,13 +46,11 @@ public final class PendingSpawn extends Node { @ObfuscatedGetter( intValue = -922964443 ) - @Export("id") int id; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1252885215 ) - @Export("orientation") int orientation; @ObfuscatedName("m") @ObfuscatedGetter( @@ -69,13 +61,11 @@ public final class PendingSpawn extends Node { @ObfuscatedGetter( intValue = 1560488333 ) - @Export("delay") int delay; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1735849843 ) - @Export("hitpoints") int hitpoints; PendingSpawn() { diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 167c61503a..9069ff63eb 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -137,7 +136,6 @@ public class PlatformInfo extends Node { descriptor = "(Lkf;B)V", garbageValue = "34" ) - @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 var1.writeByte(this.field3946); // L: 96 @@ -176,7 +174,6 @@ public class PlatformInfo extends Node { descriptor = "(I)I", garbageValue = "-202992024" ) - @Export("size") public int size() { byte var1 = 39; int var2 = var1 + class228.method4189(this.field3958); diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index b8f75af858..06a76d607b 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,6 +10,5 @@ public interface PlatformInfoProvider { descriptor = "(I)Lmr;", garbageValue = "-1896317364" ) - @Export("get") PlatformInfo get(); } diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 690934b1cb..7b093625e8 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,70 +11,58 @@ public final class Player extends Actor { @ObfuscatedSignature( descriptor = "Lfd;" ) - @Export("mouseWheel") static MouseWheel mouseWheel; @ObfuscatedName("pp") @ObfuscatedSignature( descriptor = "Lld;" ) - @Export("privateChatMode") static PrivateChatMode privateChatMode; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lku;" ) - @Export("username") Username username; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lha;" ) - @Export("appearance") PlayerAppearance appearance; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 262221405 ) - @Export("headIconPk") int headIconPk; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1053442849 ) - @Export("headIconPrayer") int headIconPrayer; @ObfuscatedName("o") - @Export("actions") String[] actions; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1265290789 ) - @Export("combatLevel") int combatLevel; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -2038384431 ) - @Export("skillLevel") int skillLevel; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1117584059 ) - @Export("tileHeight") int tileHeight; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1379087493 ) - @Export("animationCycleStart") int animationCycleStart; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1569239967 ) - @Export("animationCycleEnd") int animationCycleEnd; @ObfuscatedName("d") @ObfuscatedGetter( @@ -86,7 +73,6 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 232655151 ) - @Export("tileHeight2") int tileHeight2; @ObfuscatedName("a") @ObfuscatedGetter( @@ -97,7 +83,6 @@ public final class Player extends Actor { @ObfuscatedSignature( descriptor = "Ler;" ) - @Export("model0") Model model0; @ObfuscatedName("c") @ObfuscatedGetter( @@ -120,40 +105,33 @@ public final class Player extends Actor { ) int field643; @ObfuscatedName("j") - @Export("isUnanimated") boolean isUnanimated; @ObfuscatedName("r") @ObfuscatedGetter( intValue = 1988252929 ) - @Export("team") int team; @ObfuscatedName("u") - @Export("isHidden") boolean isHidden; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -398923579 ) - @Export("plane") int plane; @ObfuscatedName("b") @ObfuscatedGetter( intValue = -1030686615 ) - @Export("index") int index; @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("isFriendTriBool") TriBool isFriendTriBool; @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("isInClanChat") TriBool isInClanChat; @ObfuscatedName("ab") boolean field660; @@ -161,13 +139,11 @@ public final class Player extends Actor { @ObfuscatedGetter( intValue = 321223155 ) - @Export("tileX") int tileX; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 1001779515 ) - @Export("tileY") int tileY; Player() { @@ -196,7 +172,6 @@ public final class Player extends Actor { descriptor = "(Lkf;I)V", garbageValue = "-1567604648" ) - @Export("read") final void read(Buffer var1) { var1.offset = 0; // L: 54 int var2 = var1.readUnsignedByte(); // L: 55 @@ -302,7 +277,6 @@ public final class Player extends Actor { descriptor = "(I)Z", garbageValue = "-659819020" ) - @Export("isFriend") boolean isFriend() { if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 112 this.checkIsFriend(); // L: 113 @@ -316,7 +290,6 @@ public final class Player extends Actor { descriptor = "(I)V", garbageValue = "1737435180" ) - @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; // L: 119 } // L: 120 @@ -326,7 +299,6 @@ public final class Player extends Actor { descriptor = "(I)V", garbageValue = "1949087224" ) - @Export("checkIsFriend") void checkIsFriend() { this.isFriendTriBool = class60.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 } // L: 124 @@ -336,7 +308,6 @@ public final class Player extends Actor { descriptor = "(B)Z", garbageValue = "73" ) - @Export("isClanMember") boolean isClanMember() { if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 127 this.updateIsInClanChat(); // L: 128 @@ -350,7 +321,6 @@ public final class Player extends Actor { descriptor = "(B)V", garbageValue = "94" ) - @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; // L: 134 } // L: 135 @@ -360,7 +330,6 @@ public final class Player extends Actor { descriptor = "(I)V", garbageValue = "2055605300" ) - @Export("updateIsInClanChat") void updateIsInClanChat() { this.isInClanChat = Entity.clanChat != null && Entity.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 } // L: 139 @@ -370,7 +339,6 @@ public final class Player extends Actor { descriptor = "(I)I", garbageValue = "1374983546" ) - @Export("transformedSize") int transformedSize() { return this.appearance != null && this.appearance.npcTransformId != -1 ? Skeleton.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 } @@ -380,7 +348,6 @@ public final class Player extends Actor { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected final Model getModel() { if (this.appearance == null) { // L: 149 return null; @@ -478,7 +445,6 @@ public final class Player extends Actor { descriptor = "(III)V", garbageValue = "-1761567284" ) - @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; // L: 210 super.field973 = 0; // L: 211 @@ -516,7 +482,6 @@ public final class Player extends Actor { descriptor = "(I)Z", garbageValue = "68470795" ) - @Export("isVisible") final boolean isVisible() { return this.appearance != null; // L: 233 } @@ -570,7 +535,6 @@ public final class Player extends Actor { descriptor = "(Lkr;Lkr;Lkr;B)V", garbageValue = "-76" ) - @Export("drawTitle") static void drawTitle(Font var0, Font var1, Font var2) { Login.xPadding = (FloorDecoration.canvasWidth - 765) / 2; // L: 1105 Login.loginBoxX = Login.xPadding + 202; // L: 1106 diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index bf2f532c46..319ba5e2e0 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,13 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("PlayerAppearance") public class PlayerAppearance { @ObfuscatedName("n") - @Export("equipmentIndices") static final int[] equipmentIndices; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; @ObfuscatedName("cq") @ObfuscatedGetter( @@ -25,34 +22,27 @@ public class PlayerAppearance { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive14") static Archive archive14; @ObfuscatedName("ee") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive15") static Archive archive15; @ObfuscatedName("z") - @Export("equipment") int[] equipment; @ObfuscatedName("k") - @Export("bodyColors") int[] bodyColors; @ObfuscatedName("s") - @Export("isFemale") public boolean isFemale; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 32109537 ) - @Export("npcTransformId") public int npcTransformId; @ObfuscatedName("i") @ObfuscatedGetter( longValue = 7297189778048494063L ) - @Export("hash") long hash; @ObfuscatedName("o") @ObfuscatedGetter( @@ -70,7 +60,6 @@ public class PlayerAppearance { descriptor = "([I[IZII)V", garbageValue = "1005364184" ) - @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { if (var1 == null) { var1 = new int[12]; @@ -98,7 +87,6 @@ public class PlayerAppearance { descriptor = "(IZB)V", garbageValue = "-97" ) - @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { if (var1 != 1 || !this.isFemale) { // L: 47 int var3 = this.equipment[equipmentIndices[var1]]; // L: 48 @@ -173,7 +161,6 @@ public class PlayerAppearance { descriptor = "(ZI)V", garbageValue = "-1897659753" ) - @Export("changeSex") public void changeSex(boolean var1) { if (this.isFemale != var1) { // L: 106 this.update((int[])null, this.bodyColors, var1, -1); // L: 107 @@ -185,7 +172,6 @@ public class PlayerAppearance { descriptor = "(Lkf;I)V", garbageValue = "85946625" ) - @Export("write") public void write(Buffer var1) { var1.writeByte(this.isFemale ? 1 : 0); // L: 111 @@ -210,7 +196,6 @@ public class PlayerAppearance { descriptor = "(B)V", garbageValue = "6" ) - @Export("setHash") void setHash() { long var1 = this.hash; // L: 121 int var3 = this.equipment[5]; // L: 122 @@ -255,7 +240,6 @@ public class PlayerAppearance { descriptor = "(Ljm;ILjm;IB)Ler;", garbageValue = "-25" ) - @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { // L: 145 return Skeleton.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 146 @@ -369,7 +353,6 @@ public class PlayerAppearance { descriptor = "(I)Lee;", garbageValue = "491299614" ) - @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { // L: 211 return Skeleton.getNpcDefinition(this.npcTransformId).getModelData(); // L: 212 @@ -435,7 +418,6 @@ public class PlayerAppearance { descriptor = "(I)I", garbageValue = "-2109600157" ) - @Export("getChatHeadId") public int getChatHeadId() { return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + Skeleton.getNpcDefinition(this.npcTransformId).id; // L: 247 248 } @@ -445,7 +427,6 @@ public class PlayerAppearance { descriptor = "(IB)Lil;", garbageValue = "19" ) - @Export("getParamDefinition") public static ParamDefinition getParamDefinition(int var0) { ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); // L: 21 if (var1 != null) { // L: 22 @@ -496,7 +477,6 @@ public class PlayerAppearance { descriptor = "(IIIIIIIII)V", garbageValue = "1591550158" ) - @Export("drawWidgets") static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (WorldMapSprite.loadInterface(var0)) { // L: 8652 GrandExchangeOfferNameComparator.field115 = null; // L: 8659 diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 3cd41a3ba3..878c2cd275 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,6 +10,5 @@ public interface PlayerProvider { descriptor = "(I)Ldr;", garbageValue = "-1032997343" ) - @Export("player") PcmPlayer player(); } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 4abc9a5deb..948771f8e4 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,37 +10,31 @@ public enum PlayerType implements Enumerated { @ObfuscatedSignature( descriptor = "Lix;" ) - @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lix;" ) - @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lix;" ) - @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lix;" ) - @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lix;" ) - @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lix;" ) - @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), @ObfuscatedName("x") @ObfuscatedSignature( @@ -58,19 +51,15 @@ public enum PlayerType implements Enumerated { @ObfuscatedGetter( intValue = 1823451795 ) - @Export("id") final int id; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 1522972387 ) - @Export("modIcon") public final int modIcon; @ObfuscatedName("m") - @Export("isPrivileged") public final boolean isPrivileged; @ObfuscatedName("n") - @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { @@ -85,7 +74,6 @@ public enum PlayerType implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 31 } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 7d176da838..9c4d0a3b01 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,7 +10,6 @@ public class Players { @ObfuscatedSignature( descriptor = "Ldh;" ) - @Export("pcmStreamMixer") static PcmStreamMixer pcmStreamMixer; @ObfuscatedName("s") static byte[] field1285; @@ -26,37 +24,28 @@ public class Players { @ObfuscatedGetter( intValue = 1580537391 ) - @Export("Players_count") static int Players_count; @ObfuscatedName("x") - @Export("Players_indices") static int[] Players_indices; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1079575751 ) - @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; @ObfuscatedName("g") - @Export("Players_emptyIndices") static int[] Players_emptyIndices; @ObfuscatedName("m") - @Export("Players_regions") static int[] Players_regions; @ObfuscatedName("n") - @Export("Players_orientations") static int[] Players_orientations; @ObfuscatedName("d") - @Export("Players_targetIndices") static int[] Players_targetIndices; @ObfuscatedName("h") @ObfuscatedGetter( intValue = 1779975483 ) - @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; @ObfuscatedName("a") - @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; @ObfuscatedName("q") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 27491231b5..01ea9e5a44 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,124 +10,99 @@ public final class Projectile extends Entity { @ObfuscatedGetter( intValue = -1675813545 ) - @Export("id") int id; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1633530883 ) - @Export("plane") int plane; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1241662831 ) - @Export("sourceX") int sourceX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 674628417 ) - @Export("sourceY") int sourceY; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1517344079 ) - @Export("sourceZ") int sourceZ; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1565729659 ) - @Export("endHeight") int endHeight; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 287551571 ) - @Export("cycleStart") int cycleStart; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -23705649 ) - @Export("cycleEnd") int cycleEnd; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -1941838325 ) - @Export("slope") int slope; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1921562263 ) - @Export("startHeight") int startHeight; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1380116723 ) - @Export("targetIndex") int targetIndex; @ObfuscatedName("d") - @Export("isMoving") boolean isMoving; @ObfuscatedName("h") - @Export("x") double x; @ObfuscatedName("a") - @Export("y") double y; @ObfuscatedName("q") - @Export("z") double z; @ObfuscatedName("c") - @Export("speedX") double speedX; @ObfuscatedName("f") - @Export("speedY") double speedY; @ObfuscatedName("y") - @Export("speed") double speed; @ObfuscatedName("v") - @Export("speedZ") double speedZ; @ObfuscatedName("j") - @Export("accelerationZ") double accelerationZ; @ObfuscatedName("r") @ObfuscatedGetter( intValue = -2137407611 ) - @Export("yaw") int yaw; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -2024563433 ) - @Export("pitch") int pitch; @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Ljm;" ) - @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; @ObfuscatedName("b") @ObfuscatedGetter( intValue = 1681921945 ) - @Export("frame") int frame; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 1329964451 ) - @Export("frameCycle") int frameCycle; Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { @@ -161,7 +135,6 @@ public final class Projectile extends Entity { descriptor = "(IIIIB)V", garbageValue = "81" ) - @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; if (!this.isMoving) { // L: 54 @@ -189,7 +162,6 @@ public final class Projectile extends Entity { descriptor = "(IB)V", garbageValue = "-28" ) - @Export("advance") final void advance(int var1) { this.isMoving = true; // L: 71 this.x += this.speedX * (double)var1; // L: 72 @@ -225,7 +197,6 @@ public final class Projectile extends Entity { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected final Model getModel() { SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 92 Model var2 = var1.getModel(this.frame); // L: 93 @@ -242,7 +213,6 @@ public final class Projectile extends Entity { descriptor = "([Lhq;II)V", garbageValue = "-823007916" ) - @Export("drawModelComponents") static final void drawModelComponents(Widget[] var0, int var1) { for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10302 Widget var3 = var0[var2]; // L: 10303 diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 76377f1863..df6f3ff49b 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -9,7 +9,6 @@ import java.awt.image.DirectColorModel; import java.awt.image.Raster; import java.awt.image.WritableRaster; import java.util.Hashtable; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -18,10 +17,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { @ObfuscatedName("z") - @Export("component") Component component; @ObfuscatedName("k") - @Export("image") Image image; RasterProvider(int var1, int var2, Component var3) { @@ -41,7 +38,6 @@ public final class RasterProvider extends AbstractRasterProvider { descriptor = "(Ljava/awt/Component;I)V", garbageValue = "-90781444" ) - @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 @@ -51,7 +47,6 @@ public final class RasterProvider extends AbstractRasterProvider { descriptor = "(III)V", garbageValue = "-1964598850" ) - @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 } // L: 40 @@ -61,7 +56,6 @@ public final class RasterProvider extends AbstractRasterProvider { descriptor = "(IIIII)V", garbageValue = "147756616" ) - @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 } // L: 44 @@ -71,7 +65,6 @@ public final class RasterProvider extends AbstractRasterProvider { descriptor = "(Ljava/awt/Graphics;IIB)V", garbageValue = "0" ) - @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { var1.drawImage(this.image, var2, var3, this.component); // L: 48 @@ -86,7 +79,6 @@ public final class RasterProvider extends AbstractRasterProvider { descriptor = "(Ljava/awt/Graphics;IIIIB)V", garbageValue = "-54" ) - @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { Shape var6 = var1.getClip(); // L: 57 diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 76c7c905e9..9cdde3c456 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,25 +6,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { @ObfuscatedName("ag") - @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; @ObfuscatedName("ao") - @Export("Rasterizer2D_width") public static int Rasterizer2D_width; @ObfuscatedName("ae") - @Export("Rasterizer2D_height") public static int Rasterizer2D_height; @ObfuscatedName("an") - @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; @ObfuscatedName("am") - @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; @ObfuscatedName("ap") - @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; @ObfuscatedName("au") - @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; static { @@ -39,7 +31,6 @@ public class Rasterizer2D extends DualNode { } // L: 16 @ObfuscatedName("cs") - @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 Rasterizer2D_width = var1; // L: 20 @@ -48,7 +39,6 @@ public class Rasterizer2D extends DualNode { } // L: 23 @ObfuscatedName("ck") - @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 Rasterizer2D_yClipStart = 0; // L: 27 @@ -57,7 +47,6 @@ public class Rasterizer2D extends DualNode { } // L: 30 @ObfuscatedName("co") - @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 var0 = 0; @@ -82,7 +71,6 @@ public class Rasterizer2D extends DualNode { } // L: 41 @ObfuscatedName("cz") - @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 Rasterizer2D_xClipStart = var0; @@ -103,7 +91,6 @@ public class Rasterizer2D extends DualNode { } // L: 48 @ObfuscatedName("cy") - @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 var0[1] = Rasterizer2D_yClipStart; // L: 52 @@ -112,7 +99,6 @@ public class Rasterizer2D extends DualNode { } // L: 55 @ObfuscatedName("cb") - @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 Rasterizer2D_yClipStart = var0[1]; // L: 59 @@ -121,7 +107,6 @@ public class Rasterizer2D extends DualNode { } // L: 62 @ObfuscatedName("cl") - @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -142,7 +127,6 @@ public class Rasterizer2D extends DualNode { } // L: 79 @ObfuscatedName("dx") - @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 Rasterizer2D_setPixel(var0, var1, var3); // L: 83 @@ -237,7 +221,6 @@ public class Rasterizer2D extends DualNode { } // L: 84 133 @ObfuscatedName("dh") - @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 if (var4 == 256) { // L: 137 @@ -350,7 +333,6 @@ public class Rasterizer2D extends DualNode { } // L: 139 207 @ObfuscatedName("dd") - @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 var2 -= Rasterizer2D_xClipStart - var0; // L: 211 @@ -388,7 +370,6 @@ public class Rasterizer2D extends DualNode { } // L: 232 @ObfuscatedName("db") - @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 var2 -= Rasterizer2D_xClipStart - var0; // L: 236 @@ -422,7 +403,6 @@ public class Rasterizer2D extends DualNode { } // L: 253 @ObfuscatedName("dj") - @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { // L: 256 int var6 = 0; // L: 257 @@ -466,7 +446,6 @@ public class Rasterizer2D extends DualNode { } // L: 282 @ObfuscatedName("dk") - @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { // L: 285 int var8 = 0; // L: 286 @@ -528,7 +507,6 @@ public class Rasterizer2D extends DualNode { descriptor = "(IIIIII[BIZ)V", garbageValue = "1" ) - @Export("Rasterizer2D_drawGradientPixels") public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { if (var0 + var2 >= 0 && var3 + var1 >= 0) { // L: 329 if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { // L: 330 @@ -605,7 +583,6 @@ public class Rasterizer2D extends DualNode { } // L: 380 @ObfuscatedName("da") - @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); // L: 384 @@ -614,7 +591,6 @@ public class Rasterizer2D extends DualNode { } // L: 387 @ObfuscatedName("dr") - @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390 Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); // L: 391 @@ -626,7 +602,6 @@ public class Rasterizer2D extends DualNode { } // L: 396 @ObfuscatedName("dw") - @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 if (var0 < Rasterizer2D_xClipStart) { // L: 400 @@ -648,7 +623,6 @@ public class Rasterizer2D extends DualNode { } // L: 407 @ObfuscatedName("dy") - @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 if (var0 < Rasterizer2D_xClipStart) { // L: 411 @@ -678,7 +652,6 @@ public class Rasterizer2D extends DualNode { } // L: 431 @ObfuscatedName("ds") - @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 if (var1 < Rasterizer2D_yClipStart) { // L: 435 @@ -700,7 +673,6 @@ public class Rasterizer2D extends DualNode { } // L: 442 @ObfuscatedName("dl") - @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 if (var1 < Rasterizer2D_yClipStart) { // L: 446 @@ -731,7 +703,6 @@ public class Rasterizer2D extends DualNode { } // L: 467 @ObfuscatedName("di") - @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 var3 -= var1; // L: 471 @@ -813,7 +784,6 @@ public class Rasterizer2D extends DualNode { } // L: 475 480 524 @ObfuscatedName("do") - @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; // L: 528 @@ -821,7 +791,6 @@ public class Rasterizer2D extends DualNode { } // L: 529 @ObfuscatedName("df") - @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 02f38d5663..7944e38206 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,61 +10,45 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedName("k") static boolean field1808; @ObfuscatedName("s") - @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; @ObfuscatedName("t") public static boolean field1788; @ObfuscatedName("i") - @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; @ObfuscatedName("d") - @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; @ObfuscatedName("h") - @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; @ObfuscatedName("a") - @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; @ObfuscatedName("q") - @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; @ObfuscatedName("c") - @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; @ObfuscatedName("f") - @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; @ObfuscatedName("y") - @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; @ObfuscatedName("v") - @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; @ObfuscatedName("j") - @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; @ObfuscatedName("r") - @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; @ObfuscatedName("u") - @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Ley;" ) - @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; @ObfuscatedName("b") static int[] field1785; @ObfuscatedName("l") static int[] field1809; @ObfuscatedName("e") - @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; @ObfuscatedName("ab") - @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { @@ -99,13 +82,11 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 @ObfuscatedName("z") - @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 } // L: 55 @ObfuscatedName("k") - @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; // L: 58 Rasterizer3D_clipHeight = var3 - var1; // L: 59 @@ -124,7 +105,6 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 67 @ObfuscatedName("s") - @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71 @@ -151,19 +131,16 @@ public class Rasterizer3D extends Rasterizer2D { @ObfuscatedSignature( descriptor = "(Ley;)V" ) - @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; // L: 91 } // L: 92 @ObfuscatedName("o") - @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 } // L: 96 @ObfuscatedName("x") - @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; // L: 99 @@ -242,7 +219,6 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 140 @ObfuscatedName("w") - @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144 @@ -768,7 +744,6 @@ public class Rasterizer3D extends Rasterizer2D { } @ObfuscatedName("n") - @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (field1791) { // L: 524 if (var5 > Rasterizer3D_clipWidth) { // L: 525 @@ -1327,7 +1302,6 @@ public class Rasterizer3D extends Rasterizer2D { } @ObfuscatedName("h") - @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { if (field1791) { // L: 925 if (var5 > Rasterizer3D_clipWidth) { // L: 926 @@ -2043,7 +2017,6 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 983 @ObfuscatedName("q") - @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { if (field1791) { // L: 1461 if (var6 > Rasterizer3D_clipWidth) { // L: 1462 @@ -2464,7 +2437,6 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 1819 @ObfuscatedName("c") - @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1822 int var20; @@ -3086,7 +3058,6 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 1826 @ObfuscatedName("j") - @Export("Rasterizer3D_textureAlpha") static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { if (field1791) { // L: 2304 if (var6 > Rasterizer3D_clipWidth) { // L: 2305 diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index a3cd07b733..4e6ddf13c4 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -21,13 +20,10 @@ public class RawPcmStream extends PcmStream { @ObfuscatedName("x") int field1498; @ObfuscatedName("g") - @Export("numLoops") int numLoops; @ObfuscatedName("m") - @Export("start") int start; @ObfuscatedName("n") - @Export("end") int end; @ObfuscatedName("d") boolean field1502; @@ -81,7 +77,6 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } @@ -90,7 +85,6 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "()Ldc;" ) - @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } @@ -101,7 +95,6 @@ public class RawPcmStream extends PcmStream { } @ObfuscatedName("g") - @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { if (this.field1494 == 0 && this.field1496 == 0) { // L: 213 this.skip(var3); // L: 214 @@ -283,13 +276,11 @@ public class RawPcmStream extends PcmStream { } // L: 215 342 @ObfuscatedName("m") - @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 @ObfuscatedName("n") - @Export("skip") public synchronized void skip(int var1) { if (this.field1496 > 0) { // L: 345 if (var1 >= this.field1496) { // L: 346 @@ -848,7 +839,6 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( descriptor = "(Lde;II)Ldm;" ) - @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field1447 * 100)), var2 << 6) : null; // L: 63 64 } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 7a15f61cdb..27b063c0d9 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,16 +6,12 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("RawSound") public class RawSound extends AbstractSound { @ObfuscatedName("z") - @Export("sampleRate") public int sampleRate; @ObfuscatedName("k") - @Export("samples") public byte[] samples; @ObfuscatedName("s") - @Export("start") public int start; @ObfuscatedName("t") - @Export("end") int end; @ObfuscatedName("i") public boolean field1417; @@ -40,7 +35,6 @@ public class RawSound extends AbstractSound { @ObfuscatedSignature( descriptor = "(Ldf;)Lde;" ) - @Export("resample") public RawSound resample(Decimator var1) { this.samples = var1.resample(this.samples); // L: 28 this.sampleRate = var1.scaleRate(this.sampleRate); // L: 29 diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 852fc2a885..6b3412cfd9 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -1,6 +1,5 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -18,37 +17,28 @@ public class ReflectionCheck extends Node { @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("mapSceneSprites") static IndexedSprite[] mapSceneSprites; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -1209180911 ) - @Export("id") int id; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -2142089503 ) - @Export("size") int size; @ObfuscatedName("s") - @Export("operations") int[] operations; @ObfuscatedName("t") - @Export("creationErrors") int[] creationErrors; @ObfuscatedName("i") - @Export("fields") Field[] fields; @ObfuscatedName("o") - @Export("intReplaceValues") int[] intReplaceValues; @ObfuscatedName("x") - @Export("methods") Method[] methods; @ObfuscatedName("w") - @Export("arguments") byte[][][] arguments; ReflectionCheck() { diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 71be4448d1..01d4508142 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,21 @@ public abstract class RouteStrategy { @ObfuscatedGetter( intValue = 1047579843 ) - @Export("approxDestinationX") public int approxDestinationX; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1846311175 ) - @Export("approxDestinationY") public int approxDestinationY; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1025962081 ) - @Export("approxDestinationSizeX") public int approxDestinationSizeX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -881860999 ) - @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { @@ -40,7 +35,6 @@ public abstract class RouteStrategy { descriptor = "(IIILft;I)Z", garbageValue = "-1274441547" ) - @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); @ObfuscatedName("i") @@ -85,7 +79,6 @@ public abstract class RouteStrategy { descriptor = "(I)V", garbageValue = "1480468521" ) - @Export("playPcmPlayers") static final void playPcmPlayers() { if (IntHashTable.pcmPlayer1 != null) { // L: 3254 IntHashTable.pcmPlayer1.run(); diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 2a76621cf8..ca69e9310f 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,5 +1,4 @@ import java.applet.Applet; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -7,16 +6,12 @@ import net.runelite.mapping.ObfuscatedName; @Implements("RunException") public class RunException extends RuntimeException { @ObfuscatedName("z") - @Export("RunException_applet") public static Applet RunException_applet; @ObfuscatedName("k") - @Export("localPlayerName") public static String localPlayerName; @ObfuscatedName("o") - @Export("message") String message; @ObfuscatedName("x") - @Export("throwable") Throwable throwable; RunException(Throwable var1, String var2) { diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 748142113b..5a6095d2de 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,109 +6,78 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Scene") public class Scene { @ObfuscatedName("z") - @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; @ObfuscatedName("q") - @Export("tileUpdateCount") static int tileUpdateCount; @ObfuscatedName("c") - @Export("Scene_plane") static int Scene_plane; @ObfuscatedName("f") - @Export("Scene_drawnCount") static int Scene_drawnCount; @ObfuscatedName("y") - @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; @ObfuscatedName("v") - @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; @ObfuscatedName("j") - @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; @ObfuscatedName("r") - @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; @ObfuscatedName("u") - @Export("Scene_cameraXTile") static int Scene_cameraXTile; @ObfuscatedName("p") - @Export("Scene_cameraYTile") static int Scene_cameraYTile; @ObfuscatedName("b") - @Export("Scene_cameraX") static int Scene_cameraX; @ObfuscatedName("l") - @Export("Scene_cameraY") static int Scene_cameraY; @ObfuscatedName("e") - @Export("Scene_cameraZ") static int Scene_cameraZ; @ObfuscatedName("ab") - @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; @ObfuscatedName("ag") - @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; @ObfuscatedName("ao") - @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; @ObfuscatedName("ae") - @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "[Led;" ) - @Export("gameObjects") static GameObject[] gameObjects; @ObfuscatedName("am") - @Export("checkClick") static boolean checkClick; @ObfuscatedName("ap") - @Export("Scene_selectedPlane") static int Scene_selectedPlane; @ObfuscatedName("au") - @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; @ObfuscatedName("aa") - @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; @ObfuscatedName("ar") - @Export("Scene_selectedX") public static int Scene_selectedX; @ObfuscatedName("at") - @Export("Scene_selectedY") public static int Scene_selectedY; @ObfuscatedName("aq") - @Export("viewportWalking") static boolean viewportWalking; @ObfuscatedName("av") - @Export("Scene_planesCount") static int Scene_planesCount; @ObfuscatedName("ax") - @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "[[Lew;" ) - @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; @ObfuscatedName("az") - @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "[Lew;" ) - @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; @ObfuscatedName("ay") static final int[] field1874; @@ -126,66 +94,48 @@ public class Scene { @ObfuscatedName("bl") static final int[] field1884; @ObfuscatedName("br") - @Export("visibilityMap") static boolean[][][][] visibilityMap; @ObfuscatedName("bp") - @Export("visibleTiles") static boolean[][] visibleTiles; @ObfuscatedName("bn") - @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; @ObfuscatedName("bw") - @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; @ObfuscatedName("be") - @Export("Scene_viewportXMin") static int Scene_viewportXMin; @ObfuscatedName("bu") - @Export("Scene_viewportYMin") static int Scene_viewportYMin; @ObfuscatedName("ba") - @Export("Scene_viewportXMax") static int Scene_viewportXMax; @ObfuscatedName("bm") - @Export("Scene_viewportYMax") static int Scene_viewportYMax; @ObfuscatedName("k") - @Export("planes") int planes; @ObfuscatedName("s") - @Export("xSize") int xSize; @ObfuscatedName("t") - @Export("ySize") int ySize; @ObfuscatedName("i") - @Export("tileHeights") int[][][] tileHeights; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "[[[Lek;" ) - @Export("tiles") Tile[][][] tiles; @ObfuscatedName("x") - @Export("minPlane") int minPlane; @ObfuscatedName("w") - @Export("tempGameObjectsCount") int tempGameObjectsCount; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "[Led;" ) - @Export("tempGameObjects") GameObject[] tempGameObjects; @ObfuscatedName("m") int[][][] field1841; @ObfuscatedName("bi") - @Export("tileShape2D") int[][] tileShape2D; @ObfuscatedName("bg") - @Export("tileRotation2D") int[][] tileRotation2D; static { @@ -232,7 +182,6 @@ public class Scene { } // L: 103 @ObfuscatedName("z") - @Export("clear") public void clear() { int var1; int var2; @@ -265,7 +214,6 @@ public class Scene { } // L: 120 @ObfuscatedName("k") - @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -280,7 +228,6 @@ public class Scene { } // L: 129 @ObfuscatedName("s") - @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -307,7 +254,6 @@ public class Scene { } // L: 146 @ObfuscatedName("i") - @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; // L: 165 if (var5 != null) { // L: 166 @@ -316,7 +262,6 @@ public class Scene { } // L: 168 @ObfuscatedName("o") - @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { TilePaint var21; int var22; @@ -357,7 +302,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIILez;JI)V" ) - @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { if (var5 != null) { // L: 189 FloorDecoration var9 = new FloorDecoration(); // L: 190 @@ -379,7 +323,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIILez;JLez;Lez;)V" ) - @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { TileItemPile var10 = new TileItemPile(); // L: 202 var10.first = var5; // L: 203 @@ -415,7 +358,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIILez;Lez;IIJI)V" ) - @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { if (var5 != null || var6 != null) { // L: 227 BoundaryObject var12 = new BoundaryObject(); // L: 228 @@ -443,7 +385,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIILez;Lez;IIIIJI)V" ) - @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { if (var5 != null) { // L: 243 WallDecoration var14 = new WallDecoration(); // L: 244 @@ -487,7 +428,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIIILez;IJZ)Z" ) - @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { if (var6 == null) { // L: 268 return true; @@ -526,7 +466,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIIILez;IJIIII)Z" ) - @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288 } @@ -535,7 +474,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(IIIIIIIILez;IZJI)Z" ) - @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { int var16; for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292 @@ -606,7 +544,6 @@ public class Scene { } @ObfuscatedName("q") - @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 GameObject var2 = this.tempGameObjects[var1]; // L: 334 @@ -621,7 +558,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(Led;)V" ) - @Export("removeGameObject") void removeGameObject(GameObject var1) { for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 @@ -666,7 +602,6 @@ public class Scene { } // L: 374 @ObfuscatedName("r") - @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 377 if (var4 != null) { @@ -675,7 +610,6 @@ public class Scene { } // L: 378 380 @ObfuscatedName("u") - @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 383 if (var4 != null) { @@ -684,7 +618,6 @@ public class Scene { } // L: 384 386 @ObfuscatedName("p") - @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 389 if (var4 != null) { // L: 390 @@ -700,7 +633,6 @@ public class Scene { } // L: 398 @ObfuscatedName("b") - @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 401 if (var4 != null) { @@ -709,7 +641,6 @@ public class Scene { } // L: 402 404 @ObfuscatedName("l") - @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 407 if (var4 != null) { @@ -759,28 +690,24 @@ public class Scene { @ObfuscatedSignature( descriptor = "(III)Leu;" ) - @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 435 return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 } @ObfuscatedName("ae") - @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 441 return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 } @ObfuscatedName("ap") - @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 447 return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 } @ObfuscatedName("au") - @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 453 if (var4 == null) { // L: 454 @@ -798,14 +725,12 @@ public class Scene { } @ObfuscatedName("aa") - @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; // L: 463 return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 } @ObfuscatedName("ar") - @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; // L: 469 if (var6 == null) { // L: 470 @@ -969,7 +894,6 @@ public class Scene { } // L: 590 @ObfuscatedName("ah") - @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; // L: 593 if (var7 != null) { // L: 594 @@ -1034,7 +958,6 @@ public class Scene { } // L: 606 635 @ObfuscatedName("as") - @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { if (!shouldSendWalk() || var4) { // L: 714 checkClick = true; // L: 715 @@ -1048,13 +971,11 @@ public class Scene { } // L: 722 @ObfuscatedName("az") - @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; // L: 725 } // L: 726 @ObfuscatedName("ay") - @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { // L: 738 var1 = 0; @@ -1254,7 +1175,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(Lek;Z)V" ) - @Export("drawTile") void drawTile(Tile var1, boolean var2) { Scene_tilesDeque.addFirst(var1); // L: 866 @@ -1784,7 +1704,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(Lem;IIIIIII)V" ) - @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195 @@ -1895,7 +1814,6 @@ public class Scene { @ObfuscatedSignature( descriptor = "(Len;IIIIII)V" ) - @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var1.vertexX.length; // L: 1283 @@ -1971,7 +1889,6 @@ public class Scene { } // L: 1337 @ObfuscatedName("bl") - @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 @@ -2422,7 +2339,6 @@ public class Scene { } @ObfuscatedName("t") - @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); // L: 149 var8.minTileX = var2 / 128; // L: 150 @@ -2440,7 +2356,6 @@ public class Scene { } // L: 162 @ObfuscatedName("av") - @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; // L: 638 Scene_viewportYMin = 0; // L: 639 @@ -2539,7 +2454,6 @@ public class Scene { } @ObfuscatedName("ad") - @Export("shouldSendWalk") public static boolean shouldSendWalk() { return viewportWalking && Scene_selectedX != -1; // L: 729 } @@ -2563,7 +2477,6 @@ public class Scene { } @ObfuscatedName("ac") - @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347 return false; diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 43f19223f3..9d2bdcea98 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,52 +10,42 @@ public class Script extends DualNode { @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; @ObfuscatedName("iz") @ObfuscatedGetter( intValue = 1391677451 ) - @Export("selectedItemId") static int selectedItemId; @ObfuscatedName("k") - @Export("opcodes") int[] opcodes; @ObfuscatedName("s") - @Export("intOperands") int[] intOperands; @ObfuscatedName("t") - @Export("stringOperands") String[] stringOperands; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1204485325 ) - @Export("localIntCount") int localIntCount; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1685131019 ) - @Export("localStringCount") int localStringCount; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1488258005 ) - @Export("intArgumentCount") int intArgumentCount; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 395196509 ) - @Export("stringArgumentCount") int stringArgumentCount; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "[Llq;" ) - @Export("switches") IterableNodeHashTable[] switches; static { @@ -71,7 +60,6 @@ public class Script extends DualNode { descriptor = "(II)[Llq;", garbageValue = "-502401324" ) - @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; // L: 153 } @@ -81,7 +69,6 @@ public class Script extends DualNode { descriptor = "(Lby;B)V", garbageValue = "-76" ) - @Export("runScriptEvent") public static void runScriptEvent(ScriptEvent var0) { class280.runScript(var0, 500000); // L: 97 } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 4d5040c79e..b447ab8288 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,22 +10,18 @@ public class ScriptEvent extends Node { @ObfuscatedGetter( intValue = 1903848297 ) - @Export("foundItemIndex") static int foundItemIndex; @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lkr;" ) - @Export("ItemDefinition_fontPlain11") static Font ItemDefinition_fontPlain11; @ObfuscatedName("dq") - @Export("mouseCam") static boolean mouseCam; @ObfuscatedName("gb") @ObfuscatedSignature( descriptor = "Lec;" ) - @Export("scene") static Scene scene; @ObfuscatedName("gy") @ObfuscatedGetter( @@ -34,55 +29,45 @@ public class ScriptEvent extends Node { ) static int field597; @ObfuscatedName("z") - @Export("args") Object[] args; @ObfuscatedName("k") - @Export("isMouseInputEvent") boolean isMouseInputEvent; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("widget") Widget widget; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -2100516553 ) - @Export("mouseX") int mouseX; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1832434813 ) - @Export("mouseY") int mouseY; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -720675073 ) - @Export("opIndex") int opIndex; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("dragTarget") Widget dragTarget; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1621651451 ) - @Export("keyTyped") int keyTyped; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -582654831 ) - @Export("keyPressed") int keyPressed; @ObfuscatedName("m") - @Export("targetName") String targetName; @ObfuscatedName("n") @ObfuscatedGetter( @@ -93,7 +78,6 @@ public class ScriptEvent extends Node { @ObfuscatedGetter( intValue = 926169729 ) - @Export("type") int type; public ScriptEvent() { @@ -105,7 +89,6 @@ public class ScriptEvent extends Node { descriptor = "([Ljava/lang/Object;I)V", garbageValue = "-1399912972" ) - @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 @@ -115,7 +98,6 @@ public class ScriptEvent extends Node { descriptor = "(II)V", garbageValue = "-802645814" ) - @Export("setType") public void setType(int var1) { this.type = var1; } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index e9a4c94a6f..21a98be82a 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -1,5 +1,4 @@ import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,19 +11,15 @@ public class ScriptFrame { @ObfuscatedSignature( descriptor = "Lcy;" ) - @Export("script") Script script; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 394588123 ) - @Export("pc") int pc; @ObfuscatedName("s") - @Export("intLocals") int[] intLocals; @ObfuscatedName("t") - @Export("stringLocals") String[] stringLocals; ScriptFrame() { @@ -36,7 +31,6 @@ public class ScriptFrame { descriptor = "(I)Z", garbageValue = "-1817871528" ) - @Export("loadWorlds") static boolean loadWorlds() { try { if (WorldMapScaleHandler.World_request == null) { // L: 31 diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 7dd8e455ea..089e8e5b41 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,5 +1,4 @@ import java.util.concurrent.Callable; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -20,7 +19,6 @@ public class SecureRandomCallable implements Callable { descriptor = "(IIB)Lhq;", garbageValue = "105" ) - @Export("getWidgetChild") public static Widget getWidgetChild(int var0, int var1) { Widget var2 = TileItem.getWidget(var0); // L: 196 if (var1 == -1) { // L: 197 @@ -171,7 +169,6 @@ public class SecureRandomCallable implements Callable { descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", garbageValue = "-990196444" ) - @Export("menuAction") static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { if (var2 >= 2000) { // L: 7255 var2 -= 2000; diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 6ad2a13001..2bb4f4b3dd 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -2,7 +2,6 @@ import java.security.SecureRandom; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,10 +10,8 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("SecureRandomFuture") public class SecureRandomFuture { @ObfuscatedName("z") - @Export("executor") ExecutorService executor; @ObfuscatedName("k") - @Export("future") Future future; SecureRandomFuture() { @@ -27,7 +24,6 @@ public class SecureRandomFuture { descriptor = "(I)V", garbageValue = "-1936171902" ) - @Export("shutdown") void shutdown() { this.executor.shutdown(); // L: 18 this.executor = null; // L: 19 @@ -38,7 +34,6 @@ public class SecureRandomFuture { descriptor = "(B)Z", garbageValue = "11" ) - @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } @@ -48,7 +43,6 @@ public class SecureRandomFuture { descriptor = "(S)Ljava/security/SecureRandom;", garbageValue = "2000" ) - @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); // L: 28 @@ -94,7 +88,6 @@ public class SecureRandomFuture { descriptor = "(II)I", garbageValue = "116037374" ) - @Export("Messages_getHistorySize") static int Messages_getHistorySize(int var0) { ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 return var1 == null ? 0 : var1.size(); // L: 45 46 diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 1271e73983..342898caa4 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,43 +10,34 @@ public class SequenceDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("SequenceDefinition_archive") public static AbstractArchive SequenceDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("SequenceDefinition_animationsArchive") public static AbstractArchive SequenceDefinition_animationsArchive; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; @ObfuscatedName("o") - @Export("frameIds") public int[] frameIds; @ObfuscatedName("x") - @Export("chatFrameIds") int[] chatFrameIds; @ObfuscatedName("w") - @Export("frameLengths") public int[] frameLengths; @ObfuscatedName("g") - @Export("soundEffects") public int[] soundEffects; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 742845073 ) - @Export("frameCount") public int frameCount; @ObfuscatedName("n") int[] field3550; @@ -62,13 +52,11 @@ public class SequenceDefinition extends DualNode { @ObfuscatedGetter( intValue = 1046570775 ) - @Export("shield") public int shield; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 435585977 ) - @Export("weapon") public int weapon; @ObfuscatedName("c") @ObfuscatedGetter( @@ -113,7 +101,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "892270610" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 47 @@ -130,7 +117,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "322225834" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; @@ -205,7 +191,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(B)V", garbageValue = "-125" ) - @Export("postDecode") void postDecode() { if (this.field3549 == -1) { // L: 92 if (this.field3550 != null) { // L: 93 @@ -230,7 +215,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Ler;II)Ler;", garbageValue = "-1365991470" ) - @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 103 Frames var3 = UrlRequester.getFrames(var2 >> 16); // L: 104 @@ -249,7 +233,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Ler;III)Ler;", garbageValue = "2144819244" ) - @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; // L: 113 Frames var4 = UrlRequester.getFrames(var2 >> 16); // L: 114 @@ -285,7 +268,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Ler;II)Ler;", garbageValue = "2009150039" ) - @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 130 Frames var3 = UrlRequester.getFrames(var2 >> 16); // L: 131 @@ -304,7 +286,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Ler;ILjm;IB)Ler;", garbageValue = "-2" ) - @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; // L: 140 Frames var5 = UrlRequester.getFrames(var2 >> 16); // L: 141 @@ -333,7 +314,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(Ler;II)Ler;", garbageValue = "1789593927" ) - @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; // L: 158 Frames var4 = UrlRequester.getFrames(var3 >> 16); // L: 159 @@ -368,7 +348,6 @@ public class SequenceDefinition extends DualNode { descriptor = "(II)V", garbageValue = "-2006270151" ) - @Export("clearItemContainer") static void clearItemContainer(int var0) { ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 if (var1 != null) { // L: 64 diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 19094bb26c..4f1f18e1bb 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -441,19 +440,16 @@ public class ServerPacket { @ObfuscatedGetter( intValue = 281094069 ) - @Export("cameraYaw") static int cameraYaw; @ObfuscatedName("cm") @ObfuscatedGetter( intValue = -317415457 ) - @Export("id") public final int id; @ObfuscatedName("cu") @ObfuscatedGetter( intValue = -811501627 ) - @Export("length") public final int length; static { diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 46e44c736c..0a18c7b878 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,28 +10,22 @@ public class Skeleton extends Node { @ObfuscatedSignature( descriptor = "Llz;" ) - @Export("masterDisk") static ArchiveDisk masterDisk; @ObfuscatedName("gf") - @Export("regionLandArchiveIds") static int[] regionLandArchiveIds; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -891561701 ) - @Export("id") int id; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 178139825 ) - @Export("count") int count; @ObfuscatedName("s") - @Export("transformTypes") int[] transformTypes; @ObfuscatedName("t") - @Export("labels") int[][] labels; Skeleton(int var1, byte[] var2) { @@ -64,7 +57,6 @@ public class Skeleton extends Node { descriptor = "(IB)Ljx;", garbageValue = "29" ) - @Export("getNpcDefinition") public static NPCDefinition getNpcDefinition(int var0) { NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); // L: 57 if (var1 != null) { // L: 58 diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index a0485a5c3f..57b5d71610 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,10 +5,8 @@ import net.runelite.mapping.ObfuscatedName; @Implements("Skills") public class Skills { @ObfuscatedName("k") - @Export("Skills_enabled") public static final boolean[] Skills_enabled; @ObfuscatedName("s") - @Export("Skills_experienceTable") public static int[] Skills_experienceTable; static { diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index f21ff1f1eb..2c9ada93d2 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -1,5 +1,4 @@ import java.lang.ref.SoftReference; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -7,7 +6,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { @ObfuscatedName("z") - @Export("ref") SoftReference ref; SoftWrapper(Object var1, int var2) { @@ -16,13 +14,11 @@ public class SoftWrapper extends Wrapper { } // L: 12 @ObfuscatedName("z") - @Export("get") Object get() { return this.ref.get(); // L: 15 } @ObfuscatedName("k") - @Export("isSoft") boolean isSoft() { return true; // L: 19 } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 2d345305dd..10b773bfd6 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -17,25 +16,21 @@ public class SoundCache { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("soundEffectIndex") AbstractArchive soundEffectIndex; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("musicSampleIndex") AbstractArchive musicSampleIndex; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("musicSamples") NodeHashTable musicSamples; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Llc;" ) - @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( @@ -53,7 +48,6 @@ public class SoundCache { descriptor = "(II[II)Lde;", garbageValue = "-484042119" ) - @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 18 var4 |= var1 << 16; // L: 19 @@ -84,7 +78,6 @@ public class SoundCache { descriptor = "(II[IS)Lde;", garbageValue = "-29447" ) - @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 33 var4 |= var1 << 16; // L: 34 @@ -121,7 +114,6 @@ public class SoundCache { descriptor = "(I[IB)Lde;", garbageValue = "-94" ) - @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { if (this.soundEffectIndex.getGroupCount() == 1) { // L: 53 return this.getSoundEffect0(0, var1, var2); @@ -137,7 +129,6 @@ public class SoundCache { descriptor = "(I[II)Lde;", garbageValue = "-1455606991" ) - @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { if (this.musicSampleIndex.getGroupCount() == 1) { // L: 59 return this.getMusicSample0(0, var1, var2); diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 3d5de7707e..f2c26a439d 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,10 @@ public class SoundEffect { @ObfuscatedSignature( descriptor = "[Ldz;" ) - @Export("instruments") Instrument[] instruments; @ObfuscatedName("s") - @Export("start") int start; @ObfuscatedName("t") - @Export("end") int end; @ObfuscatedSignature( @@ -42,14 +38,12 @@ public class SoundEffect { @ObfuscatedSignature( descriptor = "()Lde;" ) - @Export("toRawSound") public RawSound toRawSound() { byte[] var1 = this.mix(); // L: 33 return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } @ObfuscatedName("s") - @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -84,7 +78,6 @@ public class SoundEffect { } @ObfuscatedName("t") - @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -126,7 +119,6 @@ public class SoundEffect { @ObfuscatedSignature( descriptor = "(Lic;II)Ldj;" ) - @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 15 return var3 == null ? null : new SoundEffect(new Buffer(var3)); // L: 16 diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index fa6021e5d6..018993d665 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,37 +6,26 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("SoundEnvelope") public class SoundEnvelope { @ObfuscatedName("z") - @Export("segments") int segments; @ObfuscatedName("k") - @Export("durations") int[] durations; @ObfuscatedName("s") - @Export("phases") int[] phases; @ObfuscatedName("t") - @Export("start") int start; @ObfuscatedName("i") - @Export("end") int end; @ObfuscatedName("o") - @Export("form") int form; @ObfuscatedName("w") - @Export("ticks") int ticks; @ObfuscatedName("g") - @Export("phaseIndex") int phaseIndex; @ObfuscatedName("m") - @Export("step") int step; @ObfuscatedName("n") - @Export("amplitude") int amplitude; @ObfuscatedName("d") - @Export("max") int max; SoundEnvelope() { @@ -54,7 +42,6 @@ public class SoundEnvelope { @ObfuscatedSignature( descriptor = "(Lkf;)V" ) - @Export("decode") final void decode(Buffer var1) { this.form = var1.readUnsignedByte(); // L: 31 this.start = var1.readInt(); // L: 32 @@ -66,7 +53,6 @@ public class SoundEnvelope { @ObfuscatedSignature( descriptor = "(Lkf;)V" ) - @Export("decodeSegments") final void decodeSegments(Buffer var1) { this.segments = var1.readUnsignedByte(); // L: 38 this.durations = new int[this.segments]; // L: 39 @@ -80,7 +66,6 @@ public class SoundEnvelope { } // L: 45 @ObfuscatedName("s") - @Export("reset") final void reset() { this.ticks = 0; // L: 48 this.phaseIndex = 0; // L: 49 @@ -90,7 +75,6 @@ public class SoundEnvelope { } // L: 53 @ObfuscatedName("t") - @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 this.amplitude = this.phases[this.phaseIndex++] << 15; // L: 57 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index a0f6654ca4..3d98f7ac5b 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,13 +10,11 @@ public class SoundSystem implements Runnable { @ObfuscatedGetter( intValue = -2042157485 ) - @Export("cacheGamebuild") static int cacheGamebuild; @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "[Ldr;" ) - @Export("players") volatile PcmPlayer[] players; SoundSystem() { @@ -65,7 +62,6 @@ public class SoundSystem implements Runnable { descriptor = "(Ljava/lang/CharSequence;II[BII)I", garbageValue = "-2072659501" ) - @Export("encodeStringCp1252") public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { int var5 = var2 - var1; // L: 122 @@ -165,7 +161,6 @@ public class SoundSystem implements Runnable { descriptor = "(B)Z", garbageValue = "69" ) - @Export("shouldPrioritizeDrop") static boolean shouldPrioritizeDrop() { return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 9639 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index a2d01078ae..745c956b06 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,21 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("SpotAnimationDefinition_modelArchive") public static AbstractArchive SpotAnimationDefinition_modelArchive; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("SpotAnimationDefinition_cached") public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("SpotAnimationDefinition_cachedModels") public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; @ObfuscatedName("gs") @ObfuscatedGetter( @@ -40,61 +35,49 @@ public class SpotAnimationDefinition extends DualNode { @ObfuscatedGetter( intValue = -478410851 ) - @Export("id") int id; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -19861827 ) - @Export("archive") int archive; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 393054485 ) - @Export("sequence") public int sequence; @ObfuscatedName("w") - @Export("recolorFrom") short[] recolorFrom; @ObfuscatedName("g") - @Export("recolorTo") short[] recolorTo; @ObfuscatedName("m") - @Export("retextureFrom") short[] retextureFrom; @ObfuscatedName("n") - @Export("retextureTo") short[] retextureTo; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -1945923571 ) - @Export("widthScale") int widthScale; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -1138122677 ) - @Export("heightScale") int heightScale; @ObfuscatedName("a") @ObfuscatedGetter( intValue = 702880483 ) - @Export("orientation") int orientation; @ObfuscatedName("q") @ObfuscatedGetter( intValue = 1865720119 ) - @Export("ambient") int ambient; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -1594131491 ) - @Export("contrast") int contrast; static { @@ -116,7 +99,6 @@ public class SpotAnimationDefinition extends DualNode { descriptor = "(Lkf;B)V", garbageValue = "106" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 44 @@ -133,7 +115,6 @@ public class SpotAnimationDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "1008523619" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 51 this.archive = var1.readUnsignedShort(); @@ -180,7 +161,6 @@ public class SpotAnimationDefinition extends DualNode { descriptor = "(II)Ler;", garbageValue = "-820492992" ) - @Export("getModel") public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80 if (var2 == null) { // L: 81 @@ -251,7 +231,6 @@ public class SpotAnimationDefinition extends DualNode { descriptor = "([BIII)Ljava/lang/String;", garbageValue = "-2117209732" ) - @Export("decodeStringCp1252") public static String decodeStringCp1252(byte[] var0, int var1, int var2) { char[] var3 = new char[var2]; // L: 159 int var4 = 0; // L: 160 diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 07ed8b2467..62e4a03356 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,25 +6,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Sprite") public final class Sprite extends Rasterizer2D { @ObfuscatedName("z") - @Export("pixels") public int[] pixels; @ObfuscatedName("k") - @Export("subWidth") public int subWidth; @ObfuscatedName("s") - @Export("subHeight") public int subHeight; @ObfuscatedName("t") - @Export("xOffset") public int xOffset; @ObfuscatedName("i") - @Export("yOffset") int yOffset; @ObfuscatedName("o") - @Export("width") public int width; @ObfuscatedName("x") - @Export("height") public int height; public Sprite(int[] var1, int var2, int var3) { @@ -47,7 +39,6 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedSignature( descriptor = "()Llp;" ) - @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { Sprite var1 = new Sprite(this.subWidth, this.subHeight); // L: 34 var1.width = this.width; // L: 35 @@ -68,7 +59,6 @@ public final class Sprite extends Rasterizer2D { @ObfuscatedSignature( descriptor = "()Llp;" ) - @Export("copyNormalized") public Sprite copyNormalized() { Sprite var1 = new Sprite(this.width, this.height); // L: 48 @@ -82,13 +72,11 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("s") - @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 } // L: 59 @ObfuscatedName("t") - @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 int[] var1 = new int[this.width * this.height]; // L: 63 @@ -108,7 +96,6 @@ public final class Sprite extends Rasterizer2D { } // L: 74 @ObfuscatedName("i") - @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 int var2 = var1; // L: 78 @@ -150,7 +137,6 @@ public final class Sprite extends Rasterizer2D { } // L: 99 @ObfuscatedName("o") - @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 int var2 = 0; // L: 103 @@ -166,7 +152,6 @@ public final class Sprite extends Rasterizer2D { } // L: 109 @ObfuscatedName("x") - @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 int var2 = 0; // L: 113 @@ -182,7 +167,6 @@ public final class Sprite extends Rasterizer2D { } // L: 119 @ObfuscatedName("w") - @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 int var3 = 0; // L: 123 @@ -210,7 +194,6 @@ public final class Sprite extends Rasterizer2D { } // L: 137 @ObfuscatedName("g") - @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 int var3 = var2 * this.subWidth; // L: 141 @@ -225,7 +208,6 @@ public final class Sprite extends Rasterizer2D { } // L: 146 @ObfuscatedName("m") - @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 149 var2 += this.yOffset; // L: 150 @@ -271,7 +253,6 @@ public final class Sprite extends Rasterizer2D { } // L: 182 @ObfuscatedName("d") - @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; // L: 203 var2 += this.yOffset; // L: 204 @@ -317,7 +298,6 @@ public final class Sprite extends Rasterizer2D { } // L: 236 @ObfuscatedName("a") - @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 267 int var5 = this.subWidth; // L: 268 @@ -382,7 +362,6 @@ public final class Sprite extends Rasterizer2D { } // L: 310 @ObfuscatedName("c") - @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 329 this.drawTransBgAt(var1, var2); // L: 330 @@ -432,7 +411,6 @@ public final class Sprite extends Rasterizer2D { } // L: 331 366 @ObfuscatedName("r") - @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 389 var2 += this.yOffset; // L: 390 @@ -478,7 +456,6 @@ public final class Sprite extends Rasterizer2D { } // L: 422 @ObfuscatedName("p") - @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 441 int var6 = this.subWidth; // L: 442 @@ -710,7 +687,6 @@ public final class Sprite extends Rasterizer2D { } // L: 700 @ObfuscatedName("au") - @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { int var11 = -var3 / 2; // L: 704 @@ -1258,7 +1234,6 @@ public final class Sprite extends Rasterizer2D { } // L: 1076 @ObfuscatedName("aq") - @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1079 int var5 = var3 * this.xOffset / this.width + var1; // L: 1082 @@ -1381,7 +1356,6 @@ public final class Sprite extends Rasterizer2D { } // L: 1094 1151 @ObfuscatedName("n") - @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { // L: 185 int var9; @@ -1401,7 +1375,6 @@ public final class Sprite extends Rasterizer2D { } // L: 200 @ObfuscatedName("h") - @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 239 var5 = -(var5 & 3); // L: 240 @@ -1454,7 +1427,6 @@ public final class Sprite extends Rasterizer2D { } // L: 264 @ObfuscatedName("q") - @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 313 @@ -1480,7 +1452,6 @@ public final class Sprite extends Rasterizer2D { } // L: 326 @ObfuscatedName("j") - @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; // L: 369 int var12 = (var10 & 16711935) * var11 & -16711936; // L: 370 @@ -1506,7 +1477,6 @@ public final class Sprite extends Rasterizer2D { } // L: 386 @ObfuscatedName("u") - @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; // L: 425 @@ -1528,7 +1498,6 @@ public final class Sprite extends Rasterizer2D { } // L: 438 @ObfuscatedName("b") - @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; // L: 487 int var14 = var3; // L: 488 diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 03a917767d..b9acb526a0 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,19 +15,15 @@ public class SpriteMask extends DualNode { @ObfuscatedGetter( intValue = 2052975947 ) - @Export("width") public final int width; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -583477063 ) - @Export("height") public final int height; @ObfuscatedName("s") - @Export("xWidths") public final int[] xWidths; @ObfuscatedName("t") - @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { @@ -43,7 +38,6 @@ public class SpriteMask extends DualNode { descriptor = "(III)Z", garbageValue = "1864355280" ) - @Export("contains") public boolean contains(int var1, int var2) { if (var2 >= 0 && var2 < this.xStarts.length) { // L: 719 int var3 = this.xStarts[var2]; // L: 720 @@ -60,7 +54,6 @@ public class SpriteMask extends DualNode { descriptor = "(Lhq;I)Ljava/lang/String;", garbageValue = "1504596976" ) - @Export("Widget_getSpellActionName") static String Widget_getSpellActionName(Widget var0) { if (GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var0)) == 0) { // L: 10744 return null; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 0b12b87e2b..d11526d37b 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,19 +9,16 @@ public class StructDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Llq;" ) - @Export("params") IterableNodeHashTable params; static { @@ -37,7 +33,6 @@ public class StructDefinition extends DualNode { descriptor = "(I)V", garbageValue = "-2018201430" ) - @Export("postDecode") void postDecode() { } // L: 33 @@ -46,7 +41,6 @@ public class StructDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "1854456107" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 37 @@ -63,7 +57,6 @@ public class StructDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "1912740742" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { this.params = PacketWriter.readStringIntParameters(var1, this.params); // L: 44 @@ -76,7 +69,6 @@ public class StructDefinition extends DualNode { descriptor = "(IIB)I", garbageValue = "1" ) - @Export("getIntParam") public int getIntParam(int var1, int var2) { return Username.method5309(this.params, var1, var2); // L: 49 } @@ -86,7 +78,6 @@ public class StructDefinition extends DualNode { descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", garbageValue = "101" ) - @Export("getStringParam") public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; // L: 54 String var3; @@ -109,7 +100,6 @@ public class StructDefinition extends DualNode { descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", garbageValue = "-1032705828" ) - @Export("insertMenuItemNoShift") public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { Tiles.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8236 } // L: 8237 diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 80e3d9ca1a..e759ccdd5d 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,47 +10,39 @@ public enum StudioGame implements Enumerated { @ObfuscatedSignature( descriptor = "Lis;" ) - @Export("runescape") runescape("runescape", "RuneScape", 0), @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lis;" ) - @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lis;" ) - @Export("game3") game3("game3", "Game 3", 2), @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lis;" ) - @Export("game4") game4("game4", "Game 4", 3), @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lis;" ) - @Export("game5") game5("game5", "Game 5", 4), @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lis;" ) - @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); @ObfuscatedName("x") - @Export("name") public final String name; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1491225247 ) - @Export("id") final int id; StudioGame(String var3, String var4, int var5) { @@ -64,7 +55,6 @@ public enum StudioGame implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 26 } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 4e669cc655..71ff1137aa 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,19 @@ public class Task { @ObfuscatedSignature( descriptor = "Lfl;" ) - @Export("next") Task next; @ObfuscatedName("i") - @Export("status") public volatile int status; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1774016279 ) - @Export("type") int type; @ObfuscatedName("x") - @Export("intArgument") public int intArgument; @ObfuscatedName("w") - @Export("objectArgument") Object objectArgument; @ObfuscatedName("g") - @Export("result") public volatile Object result; Task() { diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 1cc539d486..15ab84223e 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -2,7 +2,6 @@ import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,37 +10,29 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("TaskHandler") public class TaskHandler implements Runnable { @ObfuscatedName("z") - @Export("javaVendor") public static String javaVendor; @ObfuscatedName("k") - @Export("javaVersion") public static String javaVersion; @ObfuscatedName("w") - @Export("SpriteBuffer_spritePalette") static int[] SpriteBuffer_spritePalette; @ObfuscatedName("lp") @ObfuscatedSignature( descriptor = "Lcf;" ) - @Export("tempMenuAction") static MenuAction tempMenuAction; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lfl;" ) - @Export("current") Task current; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lfl;" ) - @Export("task") Task task; @ObfuscatedName("i") - @Export("thread") Thread thread; @ObfuscatedName("o") - @Export("isClosed") boolean isClosed; public TaskHandler() { @@ -69,7 +60,6 @@ public class TaskHandler implements Runnable { descriptor = "(I)V", garbageValue = "-1905813436" ) - @Export("close") public final void close() { synchronized(this) { // L: 35 this.isClosed = true; // L: 36 @@ -88,7 +78,6 @@ public class TaskHandler implements Runnable { descriptor = "(IIILjava/lang/Object;B)Lfl;", garbageValue = "1" ) - @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { Task var5 = new Task(); // L: 90 var5.type = var1; // L: 91 @@ -112,7 +101,6 @@ public class TaskHandler implements Runnable { descriptor = "(Ljava/lang/String;II)Lfl;", garbageValue = "-1230716173" ) - @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } @@ -122,7 +110,6 @@ public class TaskHandler implements Runnable { descriptor = "(Ljava/lang/Runnable;II)Lfl;", garbageValue = "1199992408" ) - @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { return this.newTask(2, var2, 0, var1); // L: 112 } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index ca296d92ba..3d36734f06 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,15 +6,12 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Texture") public class Texture extends Node { @ObfuscatedName("q") - @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; @ObfuscatedName("i") - @Export("averageRGB") int averageRGB; @ObfuscatedName("o") boolean field1647; @ObfuscatedName("x") - @Export("fileIds") int[] fileIds; @ObfuscatedName("w") int[] field1649; @@ -24,16 +20,12 @@ public class Texture extends Node { @ObfuscatedName("m") int[] field1651; @ObfuscatedName("n") - @Export("animationDirection") int animationDirection; @ObfuscatedName("d") - @Export("animationSpeed") int animationSpeed; @ObfuscatedName("h") - @Export("pixels") int[] pixels; @ObfuscatedName("a") - @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( @@ -86,7 +78,6 @@ public class Texture extends Node { @ObfuscatedSignature( descriptor = "(DILic;)Z" ) - @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { int var5; for (var5 = 0; var5 < this.fileIds.length; ++var5) { // L: 53 @@ -186,13 +177,11 @@ public class Texture extends Node { } @ObfuscatedName("k") - @Export("reset") void reset() { this.pixels = null; // L: 118 } // L: 119 @ObfuscatedName("s") - @Export("animate") void animate(int var1) { if (this.pixels != null) { // L: 122 short var2; diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 55b87fbee4..d3b451992b 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,7 +10,6 @@ public interface TextureLoader { descriptor = "(II)[I", garbageValue = "-1265290789" ) - @Export("getTexturePixels") int[] getTexturePixels(int var1); @ObfuscatedName("t") @@ -19,7 +17,6 @@ public interface TextureLoader { descriptor = "(II)I", garbageValue = "260599249" ) - @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); @ObfuscatedName("i") @@ -34,6 +31,5 @@ public interface TextureLoader { descriptor = "(IS)Z", garbageValue = "14506" ) - @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 058737a39b..116f40f3a7 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,40 +15,33 @@ public class TextureProvider implements TextureLoader { @ObfuscatedSignature( descriptor = "[Leo;" ) - @Export("textures") Texture[] textures; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lji;" ) - @Export("deque") NodeDeque deque; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1194513141 ) - @Export("capacity") int capacity; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1829748835 ) - @Export("remaining") int remaining; @ObfuscatedName("i") - @Export("brightness") double brightness; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -436241833 ) - @Export("textureSize") int textureSize; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("archive") AbstractArchive archive; @ObfuscatedSignature( @@ -81,7 +73,6 @@ public class TextureProvider implements TextureLoader { descriptor = "(I)I", garbageValue = "861798052" ) - @Export("getLoadedPercentage") public int getLoadedPercentage() { int var1 = 0; // L: 32 int var2 = 0; // L: 33 @@ -110,7 +101,6 @@ public class TextureProvider implements TextureLoader { } @ObfuscatedName("k") - @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; // L: 60 this.clear(); // L: 61 @@ -121,7 +111,6 @@ public class TextureProvider implements TextureLoader { descriptor = "(II)[I", garbageValue = "-1265290789" ) - @Export("getTexturePixels") public int[] getTexturePixels(int var1) { Texture var2 = this.textures[var1]; // L: 65 if (var2 != null) { // L: 66 @@ -154,7 +143,6 @@ public class TextureProvider implements TextureLoader { descriptor = "(II)I", garbageValue = "260599249" ) - @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } @@ -173,7 +161,6 @@ public class TextureProvider implements TextureLoader { descriptor = "(IS)Z", garbageValue = "14506" ) - @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } @@ -183,7 +170,6 @@ public class TextureProvider implements TextureLoader { descriptor = "(B)V", garbageValue = "8" ) - @Export("clear") public void clear() { for (int var1 = 0; var1 < this.textures.length; ++var1) { // L: 101 if (this.textures[var1] != null) { // L: 102 @@ -200,7 +186,6 @@ public class TextureProvider implements TextureLoader { descriptor = "(II)V", garbageValue = "-736148510" ) - @Export("animate") public void animate(int var1) { for (int var2 = 0; var2 < this.textures.length; ++var2) { // L: 109 Texture var3 = this.textures[var2]; // L: 110 @@ -226,7 +211,6 @@ public class TextureProvider implements TextureLoader { descriptor = "([Lgq;II)Lgq;", garbageValue = "1374231902" ) - @Export("findEnumerated") public static Enumerated findEnumerated(Enumerated[] var0, int var1) { Enumerated[] var2 = var0; // L: 17 diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 540e28cf4c..05c4844f6c 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,109 +10,89 @@ public final class Tile extends Node { @ObfuscatedSignature( descriptor = "Lce;" ) - @Export("clientPreferences") static ClientPreferences clientPreferences; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -400770483 ) - @Export("originalPlane") int originalPlane; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1404568893 ) - @Export("plane") int plane; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -378034661 ) - @Export("x") int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -266768933 ) - @Export("y") int y; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lem;" ) - @Export("paint") TilePaint paint; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Len;" ) - @Export("model") TileModel model; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Leb;" ) - @Export("boundaryObject") BoundaryObject boundaryObject; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lex;" ) - @Export("wallDecoration") WallDecoration wallDecoration; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Leu;" ) - @Export("floorDecoration") FloorDecoration floorDecoration; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Ldg;" ) - @Export("tileItemPile") TileItemPile tileItemPile; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 240084109 ) - @Export("gameObjectsCount") int gameObjectsCount; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "[Led;" ) - @Export("gameObjects") GameObject[] gameObjects; @ObfuscatedName("h") - @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -640534231 ) - @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1686983663 ) - @Export("minPlane") int minPlane; @ObfuscatedName("c") - @Export("drawPrimary") boolean drawPrimary; @ObfuscatedName("f") - @Export("drawSecondary") boolean drawSecondary; @ObfuscatedName("y") - @Export("drawGameObjects") boolean drawGameObjects; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 913733009 ) - @Export("drawGameObjectEdges") int drawGameObjectEdges; @ObfuscatedName("j") @ObfuscatedGetter( @@ -134,7 +113,6 @@ public final class Tile extends Node { @ObfuscatedSignature( descriptor = "Lek;" ) - @Export("linkedBelowTile") Tile linkedBelowTile; Tile(int var1, int var2, int var3) { diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index f739b52ae4..6bee7df84d 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,6 +1,5 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,13 +12,11 @@ public final class TileItem extends Entity { @ObfuscatedGetter( intValue = 652464565 ) - @Export("id") int id; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 417363545 ) - @Export("quantity") int quantity; TileItem() { @@ -30,7 +27,6 @@ public final class TileItem extends Entity { descriptor = "(I)Ler;", garbageValue = "-2026237468" ) - @Export("getModel") protected final Model getModel() { return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } @@ -40,7 +36,6 @@ public final class TileItem extends Entity { descriptor = "(II)Lhq;", garbageValue = "7632896" ) - @Export("getWidget") public static Widget getWidget(int var0) { int var1 = var0 >> 16; // L: 186 int var2 = var0 & 65535; // L: 187 @@ -77,7 +72,6 @@ public final class TileItem extends Entity { descriptor = "(CLgn;I)C", garbageValue = "-2022621554" ) - @Export("standardizeChar") static char standardizeChar(char var0, Language var1) { if (var0 >= 192 && var0 <= 255) { // L: 93 if (var0 >= 192 && var0 <= 198) { // L: 94 @@ -161,7 +155,6 @@ public final class TileItem extends Entity { } @ObfuscatedName("t") - @Export("Entity_unpackSceneX") public static int Entity_unpackSceneX(long var0) { return (int)(var0 >>> 0 & 127L); } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index 9e395ab056..9abc3d63ca 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,49 +10,41 @@ public final class TileItemPile { @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("first") Entity first; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 715274953 ) - @Export("tileHeight") int tileHeight; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -987294249 ) - @Export("x") int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1805580001 ) - @Export("y") int y; @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("second") Entity second; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("third") Entity third; @ObfuscatedName("x") @ObfuscatedGetter( longValue = -7395510386628271631L ) - @Export("tag") long tag; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -863180021 ) - @Export("height") int height; TileItemPile() { diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 9cd6cc561c..95c18b7a14 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -20,49 +19,34 @@ public final class TileModel { @ObfuscatedName("u") static final int[][] field1616; @ObfuscatedName("z") - @Export("vertexX") int[] vertexX; @ObfuscatedName("k") - @Export("vertexY") int[] vertexY; @ObfuscatedName("s") - @Export("vertexZ") int[] vertexZ; @ObfuscatedName("t") - @Export("triangleColorA") int[] triangleColorA; @ObfuscatedName("i") - @Export("triangleColorB") int[] triangleColorB; @ObfuscatedName("o") - @Export("triangleColorC") int[] triangleColorC; @ObfuscatedName("x") - @Export("faceX") int[] faceX; @ObfuscatedName("w") - @Export("faceY") int[] faceY; @ObfuscatedName("g") - @Export("faceZ") int[] faceZ; @ObfuscatedName("m") - @Export("triangleTextureId") int[] triangleTextureId; @ObfuscatedName("n") - @Export("isFlat") boolean isFlat; @ObfuscatedName("d") - @Export("shape") int shape; @ObfuscatedName("h") - @Export("rotation") int rotation; @ObfuscatedName("a") - @Export("underlayRgb") int underlayRgb; @ObfuscatedName("q") - @Export("overlayRgb") int overlayRgb; static { diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index e6dabc6afd..ebd8c5e939 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,52 +10,43 @@ public final class TilePaint { @ObfuscatedSignature( descriptor = "Lio;" ) - @Export("NetCache_currentResponse") static NetFileRequest NetCache_currentResponse; @ObfuscatedName("dt") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive13") static Archive archive13; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -533090373 ) - @Export("swColor") int swColor; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -141428387 ) - @Export("seColor") int seColor; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -2027106077 ) - @Export("neColor") int neColor; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 1015841735 ) - @Export("nwColor") int nwColor; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1352493759 ) - @Export("texture") int texture; @ObfuscatedName("o") - @Export("isFlat") boolean isFlat; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 248691895 ) - @Export("rgb") int rgb; TilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { @@ -75,7 +65,6 @@ public final class TilePaint { descriptor = "(IZIZB)V", garbageValue = "-24" ) - @Export("sortWorldList") static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { if (AbstractByteArrayCopier.World_worlds != null) { // L: 171 WorldMapRegion.doWorldSorting(0, AbstractByteArrayCopier.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index b4613fc4b6..ae1afa0492 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,16 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Tiles") public final class Tiles { @ObfuscatedName("z") - @Export("Tiles_heights") static int[][][] Tiles_heights; @ObfuscatedName("k") - @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 210424451 ) - @Export("Tiles_minPlane") static int Tiles_minPlane; @ObfuscatedName("t") static byte[][][] field528; @@ -27,13 +23,10 @@ public final class Tiles { @ObfuscatedGetter( intValue = -1682339213 ) - @Export("musicTrackVolume") public static int musicTrackVolume; @ObfuscatedName("m") - @Export("Tiles_hue") static int[] Tiles_hue; @ObfuscatedName("n") - @Export("Tiles_saturation") static int[] Tiles_saturation; @ObfuscatedName("v") static final int[] field524; @@ -82,7 +75,6 @@ public final class Tiles { descriptor = "(II)Lih;", garbageValue = "1036194944" ) - @Export("SpotAnimationDefinition_get") public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32 if (var1 != null) { // L: 33 @@ -168,7 +160,6 @@ public final class Tiles { descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", garbageValue = "-1" ) - @Export("insertMenuItem") static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { if (!Client.isMenuOpen) { // L: 8240 if (Client.menuOptionsCount < 500) { // L: 8241 diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 1871f5e00e..6719878cee 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -139,7 +138,6 @@ public class Timer { descriptor = "(Lkf;I)V", garbageValue = "-1209731041" ) - @Export("write") public void write(Buffer var1) { long var2 = this.field3601; // L: 53 var2 /= 10L; // L: 55 @@ -179,7 +177,6 @@ public class Timer { descriptor = "(Ljava/lang/CharSequence;B)I", garbageValue = "98" ) - @Export("hashString") public static int hashString(CharSequence var0) { int var1 = var0.length(); // L: 135 int var2 = 0; // L: 136 diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index da38527951..b3956a3897 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,25 +9,21 @@ public class TriBool { @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("TriBool_unknown") public static final TriBool TriBool_unknown; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("TriBool_true") public static final TriBool TriBool_true; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lkm;" ) - @Export("TriBool_false") public static final TriBool TriBool_false; @ObfuscatedName("lj") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("mousedOverWidgetIf1") static Widget mousedOverWidgetIf1; static { diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index b44e56d60f..095d08032e 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,5 +1,4 @@ import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,10 @@ public class UrlRequest { @ObfuscatedName("h") static boolean field1986; @ObfuscatedName("z") - @Export("url") final URL url; @ObfuscatedName("k") - @Export("isDone0") volatile boolean isDone0; @ObfuscatedName("s") - @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { @@ -28,7 +24,6 @@ public class UrlRequest { descriptor = "(I)Z", garbageValue = "1064227353" ) - @Export("isDone") public boolean isDone() { return this.isDone0; // L: 100 } @@ -38,7 +33,6 @@ public class UrlRequest { descriptor = "(I)[B", garbageValue = "524450632" ) - @Export("getResponse") public byte[] getResponse() { return this.response0; // L: 104 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index fee7da45e0..702b2dac2d 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -5,7 +5,6 @@ import java.net.URL; import java.net.URLConnection; import java.util.LinkedList; import java.util.Queue; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -18,16 +17,12 @@ public class UrlRequester implements Runnable { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive9") static Archive archive9; @ObfuscatedName("z") - @Export("thread") final Thread thread; @ObfuscatedName("k") - @Export("isClosed") volatile boolean isClosed; @ObfuscatedName("s") - @Export("requests") Queue requests; public UrlRequester() { @@ -42,7 +37,6 @@ public class UrlRequester implements Runnable { descriptor = "(Ljava/net/URL;I)Lei;", garbageValue = "-8401642" ) - @Export("request") public UrlRequest request(URL var1) { UrlRequest var2 = new UrlRequest(var1); // L: 71 synchronized(this) { // L: 72 @@ -57,7 +51,6 @@ public class UrlRequester implements Runnable { descriptor = "(I)V", garbageValue = "-210243346" ) - @Export("close") public void close() { this.isClosed = true; // L: 80 @@ -129,7 +122,6 @@ public class UrlRequester implements Runnable { descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "-516919063" ) - @Export("setLoginResponseString") static void setLoginResponseString(String var0, String var1, String var2) { Login.Login_response1 = var0; // L: 1456 Login.Login_response2 = var1; // L: 1457 @@ -280,7 +272,6 @@ public class UrlRequester implements Runnable { descriptor = "(II)Lef;", garbageValue = "-1165420128" ) - @Export("getFrames") static Frames getFrames(int var0) { Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 if (var1 != null) { // L: 182 diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 30743ef863..354facb660 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class User implements Comparable { @ObfuscatedSignature( descriptor = "Lku;" ) - @Export("username") Username username; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lku;" ) - @Export("previousUsername") Username previousUsername; User() { @@ -27,7 +24,6 @@ public class User implements Comparable { descriptor = "(I)Lku;", garbageValue = "-53975348" ) - @Export("getUsername") public Username getUsername() { return this.username; // L: 10 } @@ -37,7 +33,6 @@ public class User implements Comparable { descriptor = "(I)Ljava/lang/String;", garbageValue = "-2094298107" ) - @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); // L: 14 15 } @@ -47,7 +42,6 @@ public class User implements Comparable { descriptor = "(I)Ljava/lang/String;", garbageValue = "2114724515" ) - @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 } @@ -57,7 +51,6 @@ public class User implements Comparable { descriptor = "(Lku;Lku;I)V", garbageValue = "-1201574407" ) - @Export("set") void set(Username var1, Username var2) { if (var1 == null) { // L: 24 throw new NullPointerException(); @@ -72,7 +65,6 @@ public class User implements Comparable { descriptor = "(Ljc;I)I", garbageValue = "-243007320" ) - @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); // L: 30 } @@ -86,7 +78,6 @@ public class User implements Comparable { descriptor = "(IIIII)V", garbageValue = "793231569" ) - @Export("selectSpell") static void selectSpell(int var0, int var1, int var2, int var3) { Widget var4 = SecureRandomCallable.getWidgetChild(var0, var1); // L: 8100 if (var4 != null && var4.onTargetEnter != null) { // L: 8101 diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 57cc5a01d2..18d11221a0 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -1,6 +1,5 @@ import java.io.IOException; import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator1(boolean var1) { @@ -21,7 +19,6 @@ public class UserComparator1 implements Comparator { descriptor = "(Ljc;Ljc;B)I", garbageValue = "57" ) - @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 6cbd603008..ac95b23412 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,6 @@ public class UserComparator10 extends AbstractUserComparator { @ObfuscatedName("ei") static int[] field2017; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { @@ -21,7 +19,6 @@ public class UserComparator10 extends AbstractUserComparator { descriptor = "(Lko;Lko;B)I", garbageValue = "37" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 @@ -39,7 +36,6 @@ public class UserComparator10 extends AbstractUserComparator { descriptor = "(III)I", garbageValue = "1641862640" ) - @Export("ItemContainer_getCount") static int ItemContainer_getCount(int var0, int var1) { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 if (var2 == null) { // L: 22 diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index b2e6005a61..1db800b9c7 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,13 +10,10 @@ public class UserComparator2 implements Comparator { @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("leftTitleSprite") static Sprite leftTitleSprite; @ObfuscatedName("p") - @Export("userHomeDirectory") static String userHomeDirectory; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator2(boolean var1) { @@ -29,7 +25,6 @@ public class UserComparator2 implements Comparator { descriptor = "(Ljc;Ljc;I)I", garbageValue = "-512542775" ) - @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 95dd43cf44..42bda3be6c 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,7 +6,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator3(boolean var1) { @@ -19,7 +17,6 @@ public class UserComparator3 extends AbstractUserComparator { descriptor = "(Lko;Lko;B)I", garbageValue = "-39" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var2.world != var1.world) { // L: 14 return this.reversed ? var1.world - var2.world : var2.world - var1.world; // L: 15 diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index b2c1dd6167..012f203236 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,5 +1,4 @@ import java.util.Comparator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -13,10 +12,8 @@ public class UserComparator4 implements Comparator { @ObfuscatedSignature( descriptor = "Lev;" ) - @Export("urlRequester") static UrlRequester urlRequester; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator4(boolean var1) { @@ -28,7 +25,6 @@ public class UserComparator4 implements Comparator { descriptor = "(Lko;Lko;I)I", garbageValue = "1508747808" ) - @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index d276631f69..c0011acea1 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,7 +6,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { @@ -19,7 +17,6 @@ public class UserComparator5 extends AbstractUserComparator { descriptor = "(Lko;Lko;B)I", garbageValue = "46" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0) { // L: 14 if (var2.world == 0) { // L: 15 diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index cc2b1e6a81..3a94d6cbf7 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,7 +6,6 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { @@ -19,7 +17,6 @@ public class UserComparator6 extends AbstractUserComparator { descriptor = "(Lko;Lko;I)I", garbageValue = "1525327475" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 6b4410d485..d5ad7fdf3f 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -13,10 +12,8 @@ public class UserComparator7 extends AbstractUserComparator { @ObfuscatedSignature( descriptor = "Lfl;" ) - @Export("js5SocketTask") static Task js5SocketTask; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator7(boolean var1) { @@ -28,7 +25,6 @@ public class UserComparator7 extends AbstractUserComparator { descriptor = "(Lko;Lko;I)I", garbageValue = "1614336230" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { // L: 14 return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 15 @@ -46,7 +42,6 @@ public class UserComparator7 extends AbstractUserComparator { descriptor = "([BS)Lcy;", garbageValue = "-15973" ) - @Export("newScript") static Script newScript(byte[] var0) { Script var1 = new Script(); // L: 111 Buffer var2 = new Buffer(var0); // L: 112 @@ -103,7 +98,6 @@ public class UserComparator7 extends AbstractUserComparator { descriptor = "(Ljava/lang/CharSequence;IZI)I", garbageValue = "-1793488116" ) - @Export("parseIntCustomRadix") static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { if (var1 >= 2 && var1 <= 36) { // L: 75 boolean var3 = false; // L: 76 diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 2385546c1a..17f6bca2bc 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,10 +11,8 @@ public class UserComparator8 extends AbstractUserComparator { @ObfuscatedGetter( intValue = 1924820265 ) - @Export("selectedSpellFlags") static int selectedSpellFlags; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { @@ -27,7 +24,6 @@ public class UserComparator8 extends AbstractUserComparator { descriptor = "(Lko;Lko;I)I", garbageValue = "2134639094" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world) { // L: 15 if (var2.world != Client.worldId) { @@ -64,7 +60,6 @@ public class UserComparator8 extends AbstractUserComparator { descriptor = "(IIIILjava/lang/String;I)V", garbageValue = "5447361" ) - @Export("widgetDefaultMenuAction") static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { Widget var5 = SecureRandomCallable.getWidgetChild(var1, var2); // L: 8137 if (var5 != null) { // L: 8138 diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 7dfd6a3586..e1fefb1ccd 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,7 +12,6 @@ public class UserComparator9 extends AbstractUserComparator { ) static int field2013; @ObfuscatedName("z") - @Export("reversed") final boolean reversed; public UserComparator9(boolean var1) { @@ -25,7 +23,6 @@ public class UserComparator9 extends AbstractUserComparator { descriptor = "(Lko;Lko;B)I", garbageValue = "6" ) - @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 16 @@ -52,7 +49,6 @@ public class UserComparator9 extends AbstractUserComparator { } // L: 89 @ObfuscatedName("o") - @Export("Entity_unpackID") public static int Entity_unpackID(long var0) { return (int)(var0 >>> 17 & 4294967295L); // L: 76 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 16341b8deb..ded817db60 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -1,7 +1,6 @@ import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,28 +13,22 @@ public abstract class UserList { @ObfuscatedGetter( intValue = 2008774827 ) - @Export("capacity") final int capacity; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1305401637 ) - @Export("size") int size; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "[Ljc;" ) - @Export("array") User[] array; @ObfuscatedName("x") - @Export("usernamesMap") HashMap usernamesMap; @ObfuscatedName("w") - @Export("previousUsernamesMap") HashMap previousUsernamesMap; @ObfuscatedName("g") - @Export("comparator") Comparator comparator; UserList(int var1) { @@ -52,7 +45,6 @@ public abstract class UserList { descriptor = "(B)Ljc;", garbageValue = "35" ) - @Export("newInstance") abstract User newInstance(); @ObfuscatedName("k") @@ -60,7 +52,6 @@ public abstract class UserList { descriptor = "(IB)[Ljc;", garbageValue = "-19" ) - @Export("newTypedArray") abstract User[] newTypedArray(int var1); @ObfuscatedName("w") @@ -68,7 +59,6 @@ public abstract class UserList { descriptor = "(I)V", garbageValue = "1831744514" ) - @Export("clear") public void clear() { this.size = 0; // L: 23 Arrays.fill(this.array, (Object)null); // L: 24 @@ -81,7 +71,6 @@ public abstract class UserList { descriptor = "(I)I", garbageValue = "-1512383935" ) - @Export("getSize") public int getSize() { return this.size; // L: 30 } @@ -91,7 +80,6 @@ public abstract class UserList { descriptor = "(I)Z", garbageValue = "-886251053" ) - @Export("isFull") public boolean isFull() { return this.size == this.capacity; // L: 34 } @@ -101,7 +89,6 @@ public abstract class UserList { descriptor = "(Lku;I)Z", garbageValue = "-311304829" ) - @Export("contains") public boolean contains(Username var1) { if (!var1.hasCleanName()) { // L: 38 return false; @@ -115,7 +102,6 @@ public abstract class UserList { descriptor = "(Lku;I)Ljc;", garbageValue = "1710477064" ) - @Export("getByUsername") public User getByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); // L: 44 return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 @@ -126,7 +112,6 @@ public abstract class UserList { descriptor = "(Lku;I)Ljc;", garbageValue = "-1895174831" ) - @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51 } @@ -136,7 +121,6 @@ public abstract class UserList { descriptor = "(Lku;I)Ljc;", garbageValue = "835389393" ) - @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 } @@ -146,7 +130,6 @@ public abstract class UserList { descriptor = "(Lku;I)Z", garbageValue = "759347580" ) - @Export("removeByUsername") public final boolean removeByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); // L: 60 if (var2 == null) { // L: 61 @@ -162,7 +145,6 @@ public abstract class UserList { descriptor = "(Ljc;I)V", garbageValue = "-2147483648" ) - @Export("remove") final void remove(User var1) { int var2 = this.indexOf(var1); // L: 67 if (var2 != -1) { // L: 68 @@ -176,7 +158,6 @@ public abstract class UserList { descriptor = "(Lku;I)Ljc;", garbageValue = "-213135493" ) - @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 74 } @@ -186,7 +167,6 @@ public abstract class UserList { descriptor = "(Lku;Lku;I)Ljc;", garbageValue = "-230668555" ) - @Export("addLast") User addLast(Username var1, Username var2) { if (this.getByCurrentUsername(var1) != null) { // L: 78 throw new IllegalStateException(); @@ -204,7 +184,6 @@ public abstract class UserList { descriptor = "(II)Ljc;", garbageValue = "1213282055" ) - @Export("get") public final User get(int var1) { if (var1 >= 0 && var1 < this.size) { // L: 87 return this.array[var1]; @@ -218,7 +197,6 @@ public abstract class UserList { descriptor = "(I)V", garbageValue = "-2116233502" ) - @Export("sort") public final void sort() { if (this.comparator == null) { // L: 92 Arrays.sort(this.array, 0, this.size); // L: 93 @@ -233,7 +211,6 @@ public abstract class UserList { descriptor = "(Ljc;Lku;Lku;B)V", garbageValue = "5" ) - @Export("changeName") final void changeName(User var1, Username var2, Username var3) { this.mapRemove(var1); // L: 101 var1.set(var2, var3); // L: 102 @@ -245,7 +222,6 @@ public abstract class UserList { descriptor = "(Ljc;I)I", garbageValue = "-1151090294" ) - @Export("indexOf") final int indexOf(User var1) { for (int var2 = 0; var2 < this.size; ++var2) { // L: 107 if (this.array[var2] == var1) { // L: 108 @@ -261,7 +237,6 @@ public abstract class UserList { descriptor = "(Ljc;I)V", garbageValue = "1797104499" ) - @Export("mapRemove") final void mapRemove(User var1) { if (this.usernamesMap.remove(var1.username) == null) { // L: 114 throw new IllegalStateException(); @@ -278,7 +253,6 @@ public abstract class UserList { descriptor = "(Ljc;I)V", garbageValue = "-909101676" ) - @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; // L: 119 } // L: 120 @@ -288,7 +262,6 @@ public abstract class UserList { descriptor = "(Ljc;B)V", garbageValue = "44" ) - @Export("mapPut") final void mapPut(User var1) { this.usernamesMap.put(var1.username, var1); // L: 123 if (var1.previousUsername != null) { // L: 124 @@ -305,7 +278,6 @@ public abstract class UserList { descriptor = "(IB)V", garbageValue = "7" ) - @Export("arrayRemove") final void arrayRemove(int var1) { --this.size; // L: 133 if (var1 < this.size) { // L: 134 @@ -319,7 +291,6 @@ public abstract class UserList { descriptor = "(I)V", garbageValue = "-50074451" ) - @Export("removeComparator") public final void removeComparator() { this.comparator = null; // L: 143 } // L: 144 @@ -329,7 +300,6 @@ public abstract class UserList { descriptor = "(Ljava/util/Comparator;I)V", garbageValue = "-2021425176" ) - @Export("addComparator") public final void addComparator(Comparator var1) { if (this.comparator == null) { // L: 147 this.comparator = var1; // L: 148 diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index f31ca44cdc..c51a1c3caa 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,13 +6,10 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Username") public class Username implements Comparable { @ObfuscatedName("t") - @Export("SpriteBuffer_xOffsets") static int[] SpriteBuffer_xOffsets; @ObfuscatedName("z") - @Export("name") String name; @ObfuscatedName("k") - @Export("cleanName") String cleanName; @ObfuscatedSignature( @@ -80,7 +76,6 @@ public class Username implements Comparable { descriptor = "(I)Ljava/lang/String;", garbageValue = "-2006682850" ) - @Export("getName") public String getName() { return this.name; // L: 72 } @@ -90,7 +85,6 @@ public class Username implements Comparable { descriptor = "(B)Z", garbageValue = "2" ) - @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; // L: 76 } @@ -100,7 +94,6 @@ public class Username implements Comparable { descriptor = "(Lku;I)I", garbageValue = "-354391485" ) - @Export("compareToTyped") public int compareToTyped(Username var1) { if (this.cleanName == null) { // L: 100 return var1.cleanName == null ? 0 : 1; // L: 101 102 diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index c4293f621c..0caebecbb3 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,6 +10,5 @@ public interface Usernamed { descriptor = "(I)Lku;", garbageValue = "1348007061" ) - @Export("username") Username username(); } diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 9aa3eaa5e9..bad7937aee 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -1,5 +1,4 @@ import java.applet.Applet; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,37 +11,31 @@ public class VarbitDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("VarbitDefinition_cached") static EvictingDualNodeHashTable VarbitDefinition_cached; @ObfuscatedName("hf") @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("mapMarkerSprites") static Sprite[] mapMarkerSprites; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -416955877 ) - @Export("baseVar") public int baseVar; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -740697079 ) - @Export("startBit") public int startBit; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -427959509 ) - @Export("endBit") public int endBit; static { @@ -57,7 +50,6 @@ public class VarbitDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "2006870580" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 30 @@ -74,7 +66,6 @@ public class VarbitDefinition extends DualNode { descriptor = "(Lkf;II)V", garbageValue = "1701572620" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 37 this.baseVar = var1.readUnsignedShort(); // L: 38 diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index d37fdf94e2..ee62b6b8c1 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,16 +9,13 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; @ObfuscatedName("s") - @Export("persist") public boolean persist; static { diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 77bd4a028f..94d102f937 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,25 +15,19 @@ public class Varcs { @ObfuscatedSignature( descriptor = "Lcv;" ) - @Export("loginScreenRunesAnimation") static LoginScreenAnimation loginScreenRunesAnimation; @ObfuscatedName("he") @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("headIconHintSprites") static Sprite[] headIconHintSprites; @ObfuscatedName("s") - @Export("intsPersistence") boolean[] intsPersistence; @ObfuscatedName("t") - @Export("map") Map map; @ObfuscatedName("i") - @Export("strings") String[] strings; @ObfuscatedName("o") - @Export("unwrittenChanges") boolean unwrittenChanges; @ObfuscatedName("x") @ObfuscatedGetter( @@ -68,7 +61,6 @@ public class Varcs { descriptor = "(III)V", garbageValue = "-500127476" ) - @Export("setInt") void setInt(int var1, int var2) { this.map.put(var1, var2); // L: 42 if (this.intsPersistence[var1]) { @@ -82,7 +74,6 @@ public class Varcs { descriptor = "(IB)I", garbageValue = "-31" ) - @Export("getInt") int getInt(int var1) { Object var2 = this.map.get(var1); // L: 47 return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 @@ -93,7 +84,6 @@ public class Varcs { descriptor = "(ILjava/lang/String;I)V", garbageValue = "-1549127087" ) - @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); // L: 55 } // L: 56 @@ -103,7 +93,6 @@ public class Varcs { descriptor = "(IB)Ljava/lang/String;", garbageValue = "95" ) - @Export("getString") String getString(int var1) { Object var2 = this.map.get(var1); // L: 59 return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 @@ -114,7 +103,6 @@ public class Varcs { descriptor = "(ILjava/lang/String;I)V", garbageValue = "1427019178" ) - @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; // L: 67 } // L: 68 @@ -124,7 +112,6 @@ public class Varcs { descriptor = "(IB)Ljava/lang/String;", garbageValue = "106" ) - @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; // L: 71 } @@ -134,7 +121,6 @@ public class Varcs { descriptor = "(B)V", garbageValue = "-69" ) - @Export("clearTransient") void clearTransient() { int var1; for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 75 @@ -154,7 +140,6 @@ public class Varcs { descriptor = "(ZI)Lmy;", garbageValue = "-850108574" ) - @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { return class2.getPreferencesFile("2", Tiles.field532.name, var1); // L: 86 } @@ -164,7 +149,6 @@ public class Varcs { descriptor = "(B)V", garbageValue = "67" ) - @Export("write") void write() { AccessFile var1 = this.getPreferencesFile(true); // L: 90 @@ -251,7 +235,6 @@ public class Varcs { descriptor = "(B)V", garbageValue = "2" ) - @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); // L: 154 @@ -343,7 +326,6 @@ public class Varcs { descriptor = "(B)V", garbageValue = "89" ) - @Export("tryWrite") void tryWrite() { if (this.unwrittenChanges && this.field1295 < PacketWriter.currentTimeMillis() - 60000L) { // L: 206 this.write(); // L: 207 @@ -356,7 +338,6 @@ public class Varcs { descriptor = "(I)Z", garbageValue = "-1436880111" ) - @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; // L: 212 } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index b28121371c..bd33378022 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,21 @@ public class VarpDefinition extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("VarpDefinition_archive") static AbstractArchive VarpDefinition_archive; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1332454231 ) - @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -955851785 ) - @Export("type") public int type; static { @@ -45,7 +40,6 @@ public class VarpDefinition extends DualNode { descriptor = "(Lkf;I)V", garbageValue = "1437653896" ) - @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 34 @@ -62,7 +56,6 @@ public class VarpDefinition extends DualNode { descriptor = "(Lkf;IS)V", garbageValue = "24454" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); @@ -75,7 +68,6 @@ public class VarpDefinition extends DualNode { descriptor = "(Lbf;ZI)V", garbageValue = "-1746985052" ) - @Export("addPlayerToScene") static void addPlayerToScene(Player var0, boolean var1) { if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4260 var0.isUnanimated = false; // L: 4261 @@ -115,7 +107,6 @@ public class VarpDefinition extends DualNode { descriptor = "(Lbf;IIII)V", garbageValue = "-1811983965" ) - @Export("addPlayerToMenu") static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { if (WorldMapLabelSize.localPlayer != var0) { // L: 8564 if (Client.menuOptionsCount < 400) { // L: 8565 diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index df0f0a42ae..f87493de3c 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,19 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("Varps") public class Varps { @ObfuscatedName("z") - @Export("Varps_masks") static int[] Varps_masks; @ObfuscatedName("k") - @Export("Varps_temp") public static int[] Varps_temp; @ObfuscatedName("s") - @Export("Varps_main") public static int[] Varps_main; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1581164719 ) - @Export("Interpreter_stringStackSize") static int Interpreter_stringStackSize; static { @@ -41,7 +36,6 @@ public class Varps { descriptor = "(Liw;IIIBZI)V", garbageValue = "-1882336793" ) - @Export("requestNetFile") static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { long var6 = (long)((var1 << 16) + var2); // L: 271 NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 272 diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 521a78fbc8..265af8c20a 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,31 +10,26 @@ public class VertexNormal { @ObfuscatedGetter( intValue = 1417653903 ) - @Export("cameraX") static int cameraX; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -213210241 ) - @Export("magnitude") int magnitude; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 525564355 ) - @Export("x") int x; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1643627841 ) - @Export("y") int y; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1440997727 ) - @Export("z") int z; VertexNormal() { diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 68fe73b2f7..b15fad68ed 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,7 +15,6 @@ public enum VerticalAlignment implements Enumerated { @ObfuscatedSignature( descriptor = "Lit;" ) - @Export("VerticalAlignment_centered") VerticalAlignment_centered(0, 1), @ObfuscatedName("s") @ObfuscatedSignature( @@ -28,19 +26,16 @@ public enum VerticalAlignment implements Enumerated { @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("hoveredItemContainer") static Widget hoveredItemContainer; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1300403611 ) - @Export("value") public final int value; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -496509631 ) - @Export("id") final int id; VerticalAlignment(int var3, int var4) { @@ -53,7 +48,6 @@ public enum VerticalAlignment implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 19 } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index a92c403e9c..707858c553 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -9,22 +8,18 @@ import netscape.javascript.JSObject; @Implements("ViewportMouse") public class ViewportMouse { @ObfuscatedName("z") - @Export("ViewportMouse_isInViewport") static boolean ViewportMouse_isInViewport; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1355902097 ) - @Export("ViewportMouse_x") static int ViewportMouse_x; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1743017163 ) - @Export("ViewportMouse_y") static int ViewportMouse_y; @ObfuscatedName("t") - @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; @ObfuscatedName("i") @ObfuscatedGetter( @@ -50,10 +45,8 @@ public class ViewportMouse { @ObfuscatedGetter( intValue = 1953465913 ) - @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; @ObfuscatedName("q") - @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; static { @@ -81,7 +74,6 @@ public class ViewportMouse { descriptor = "(I)V", garbageValue = "173237024" ) - @Export("logOut") static final void logOut() { Client.packetWriter.close(); // L: 2485 Actor.method1805(); // L: 2486 diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 0c3fb506da..b7e83ca00f 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,20 +5,16 @@ import net.runelite.mapping.ObfuscatedName; @Implements("VorbisCodebook") public class VorbisCodebook { @ObfuscatedName("z") - @Export("dimensions") int dimensions; @ObfuscatedName("k") - @Export("entries") int entries; @ObfuscatedName("s") - @Export("lengthMap") int[] lengthMap; @ObfuscatedName("t") int[] field1372; @ObfuscatedName("i") float[][] field1369; @ObfuscatedName("o") - @Export("keys") int[] keys; VorbisCodebook() { @@ -223,7 +218,6 @@ public class VorbisCodebook { } @ObfuscatedName("z") - @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; Client.method1789(var2, var1) > var0; --var2) { // L: 16 17 diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 4ada4ddb57..1c118bd65b 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -8,7 +7,6 @@ public class VorbisFloor { @ObfuscatedName("z") static final int[] field1422; @ObfuscatedName("k") - @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; @ObfuscatedName("m") static int[] field1418; @@ -19,22 +17,16 @@ public class VorbisFloor { @ObfuscatedName("s") int[] field1420; @ObfuscatedName("t") - @Export("multiplier") int multiplier; @ObfuscatedName("i") - @Export("partitionClassList") int[] partitionClassList; @ObfuscatedName("o") - @Export("classDimensions") int[] classDimensions; @ObfuscatedName("x") - @Export("classSubClasses") int[] classSubClasses; @ObfuscatedName("w") - @Export("classMasterbooks") int[] classMasterbooks; @ObfuscatedName("g") - @Export("subclassBooks") int[][] subclassBooks; static { @@ -154,7 +146,6 @@ public class VorbisFloor { } // L: 80 @ObfuscatedName("i") - @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 @@ -184,7 +175,6 @@ public class VorbisFloor { } // L: 105 @ObfuscatedName("o") - @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 2f18c2bd5c..afd4d5bd7f 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,16 +5,12 @@ import net.runelite.mapping.ObfuscatedName; @Implements("VorbisMapping") public class VorbisMapping { @ObfuscatedName("z") - @Export("submaps") int submaps; @ObfuscatedName("k") - @Export("mappingMux") int mappingMux; @ObfuscatedName("s") - @Export("submapFloor") int[] submapFloor; @ObfuscatedName("t") - @Export("submapResidue") int[] submapResidue; VorbisMapping() { diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 8d6d22268e..28914e1dd5 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,25 +5,18 @@ import net.runelite.mapping.ObfuscatedName; @Implements("VorbisResidue") public class VorbisResidue { @ObfuscatedName("z") - @Export("residueType") int residueType; @ObfuscatedName("k") - @Export("begin") int begin; @ObfuscatedName("s") - @Export("end") int end; @ObfuscatedName("t") - @Export("partitionSize") int partitionSize; @ObfuscatedName("i") - @Export("classifications") int classifications; @ObfuscatedName("o") - @Export("classbook") int classbook; @ObfuscatedName("x") - @Export("cascade") int[] cascade; VorbisResidue() { diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 198cfff0f6..6d6924bfe5 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,49 +6,38 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("VorbisSample") public class VorbisSample extends Node { @ObfuscatedName("x") - @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; @ObfuscatedName("w") - @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; @ObfuscatedName("g") - @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; @ObfuscatedName("m") - @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; @ObfuscatedName("n") - @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "[Ldb;" ) - @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "[Lda;" ) - @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "[Ldo;" ) - @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "[Ldn;" ) - @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; @ObfuscatedName("c") - @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; @ObfuscatedName("f") - @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; @ObfuscatedName("y") static boolean field1410; @@ -74,16 +62,12 @@ public class VorbisSample extends Node { @ObfuscatedName("z") byte[][] field1397; @ObfuscatedName("k") - @Export("sampleRate") int sampleRate; @ObfuscatedName("s") - @Export("sampleCount") int sampleCount; @ObfuscatedName("t") - @Export("start") int start; @ObfuscatedName("i") - @Export("end") int end; @ObfuscatedName("o") boolean field1395; @@ -96,7 +80,6 @@ public class VorbisSample extends Node { @ObfuscatedName("u") boolean field1400; @ObfuscatedName("am") - @Export("samples") byte[] samples; @ObfuscatedName("ap") int field1383; @@ -112,7 +95,6 @@ public class VorbisSample extends Node { } // L: 402 @ObfuscatedName("i") - @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 this.sampleRate = var2.readInt(); // L: 90 @@ -401,7 +383,6 @@ public class VorbisSample extends Node { @ObfuscatedSignature( descriptor = "([I)Lde;" ) - @Export("toRawSound") RawSound toRawSound(int[] var1) { if (var1 != null && var1[0] <= 0) { // L: 405 return null; @@ -452,7 +433,6 @@ public class VorbisSample extends Node { } @ObfuscatedName("z") - @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 int var2 = var0 & Integer.MIN_VALUE; // L: 48 @@ -465,7 +445,6 @@ public class VorbisSample extends Node { } @ObfuscatedName("k") - @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 VorbisSample_byteOffset = var1; // L: 56 @@ -473,7 +452,6 @@ public class VorbisSample extends Node { } // L: 58 @ObfuscatedName("s") - @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 ++VorbisSample_bitOffset; // L: 62 @@ -483,7 +461,6 @@ public class VorbisSample extends Node { } @ObfuscatedName("t") - @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -634,7 +611,6 @@ public class VorbisSample extends Node { @ObfuscatedSignature( descriptor = "(Lic;II)Ldk;" ) - @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { if (!method2468(var0)) { // L: 391 var0.tryLoadFile(var1, var2); // L: 392 diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index a6829499a2..0e11f89eff 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,67 +10,56 @@ public final class WallDecoration { @ObfuscatedGetter( intValue = 1170791361 ) - @Export("orientation") int orientation; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 85116123 ) - @Export("tileHeight") int tileHeight; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 841011539 ) - @Export("x") int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 321574291 ) - @Export("y") int y; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -429102155 ) - @Export("orientation2") int orientation2; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -978448895 ) - @Export("xOffset") int xOffset; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 2017479075 ) - @Export("yOffset") int yOffset; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("entity1") public Entity entity1; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lez;" ) - @Export("entity2") public Entity entity2; @ObfuscatedName("m") @ObfuscatedGetter( longValue = -8703832368131294063L ) - @Export("tag") public long tag; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -2069520015 ) - @Export("flags") int flags; WallDecoration() { diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 70ee656a33..02a1843be2 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1,5 +1,4 @@ import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,150 +11,125 @@ public class Widget extends Node { @ObfuscatedSignature( descriptor = "[[Lhq;" ) - @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("Widget_archive") public static AbstractArchive Widget_archive; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("Widget_modelsArchive") public static AbstractArchive Widget_modelsArchive; @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; @ObfuscatedName("f") public static boolean field2611; @ObfuscatedName("y") - @Export("isIf3") public boolean isIf3; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 1189552295 ) - @Export("id") public int id; @ObfuscatedName("j") @ObfuscatedGetter( intValue = -1997993253 ) - @Export("childIndex") public int childIndex; @ObfuscatedName("r") @ObfuscatedGetter( intValue = -531389959 ) - @Export("type") public int type; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -271172565 ) - @Export("buttonType") public int buttonType; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -784599883 ) - @Export("contentType") public int contentType; @ObfuscatedName("b") @ObfuscatedGetter( intValue = -160427093 ) - @Export("xAlignment") public int xAlignment; @ObfuscatedName("l") @ObfuscatedGetter( intValue = 1846560629 ) - @Export("yAlignment") public int yAlignment; @ObfuscatedName("e") @ObfuscatedGetter( intValue = 84465573 ) - @Export("widthAlignment") public int widthAlignment; @ObfuscatedName("ab") @ObfuscatedGetter( intValue = 1226090749 ) - @Export("heightAlignment") public int heightAlignment; @ObfuscatedName("ag") @ObfuscatedGetter( intValue = -2088624487 ) - @Export("rawX") public int rawX; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 1233836267 ) - @Export("rawY") public int rawY; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = 1843073905 ) - @Export("rawWidth") public int rawWidth; @ObfuscatedName("an") @ObfuscatedGetter( intValue = -1879271747 ) - @Export("rawHeight") public int rawHeight; @ObfuscatedName("am") @ObfuscatedGetter( intValue = -1517732015 ) - @Export("x") public int x; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = 256308969 ) - @Export("y") public int y; @ObfuscatedName("au") @ObfuscatedGetter( intValue = 1613274363 ) - @Export("width") public int width; @ObfuscatedName("aa") @ObfuscatedGetter( intValue = 1991496335 ) - @Export("height") public int height; @ObfuscatedName("ar") @ObfuscatedGetter( @@ -171,85 +145,70 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = 1948885583 ) - @Export("parentId") public int parentId; @ObfuscatedName("al") - @Export("isHidden") public boolean isHidden; @ObfuscatedName("ah") @ObfuscatedGetter( intValue = -1183715667 ) - @Export("scrollX") public int scrollX; @ObfuscatedName("av") @ObfuscatedGetter( intValue = -699502093 ) - @Export("scrollY") public int scrollY; @ObfuscatedName("ax") @ObfuscatedGetter( intValue = -1556531767 ) - @Export("scrollWidth") public int scrollWidth; @ObfuscatedName("as") @ObfuscatedGetter( intValue = 1626628049 ) - @Export("scrollHeight") public int scrollHeight; @ObfuscatedName("az") @ObfuscatedGetter( intValue = 1201601061 ) - @Export("color") public int color; @ObfuscatedName("ad") @ObfuscatedGetter( intValue = -1272515191 ) - @Export("color2") public int color2; @ObfuscatedName("ai") @ObfuscatedGetter( intValue = -5591483 ) - @Export("mouseOverColor") public int mouseOverColor; @ObfuscatedName("ay") @ObfuscatedGetter( intValue = 1367295317 ) - @Export("mouseOverColor2") public int mouseOverColor2; @ObfuscatedName("aj") - @Export("fill") public boolean fill; @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "Llm;" ) - @Export("fillMode") public FillMode fillMode; @ObfuscatedName("af") @ObfuscatedGetter( intValue = 955254737 ) - @Export("transparencyTop") public int transparencyTop; @ObfuscatedName("ak") @ObfuscatedGetter( intValue = 1148839493 ) - @Export("transparencyBot") public int transparencyBot; @ObfuscatedName("ac") @ObfuscatedGetter( intValue = -1328949873 ) - @Export("lineWid") public int lineWid; @ObfuscatedName("bl") public boolean field2639; @@ -257,112 +216,92 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = -1969239081 ) - @Export("spriteId2") public int spriteId2; @ObfuscatedName("bz") @ObfuscatedGetter( intValue = -250118287 ) - @Export("spriteId") public int spriteId; @ObfuscatedName("bj") @ObfuscatedGetter( intValue = -237364125 ) - @Export("spriteAngle") public int spriteAngle; @ObfuscatedName("bh") - @Export("spriteTiling") public boolean spriteTiling; @ObfuscatedName("bi") @ObfuscatedGetter( intValue = -1634007559 ) - @Export("outline") public int outline; @ObfuscatedName("bg") @ObfuscatedGetter( intValue = 1037474535 ) - @Export("spriteShadow") public int spriteShadow; @ObfuscatedName("br") - @Export("spriteFlipV") public boolean spriteFlipV; @ObfuscatedName("bp") - @Export("spriteFlipH") public boolean spriteFlipH; @ObfuscatedName("bn") @ObfuscatedGetter( intValue = 1324605985 ) - @Export("modelType") public int modelType; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = 734022747 ) - @Export("modelId") public int modelId; @ObfuscatedName("be") @ObfuscatedGetter( intValue = 1986373533 ) - @Export("modelType2") int modelType2; @ObfuscatedName("bu") @ObfuscatedGetter( intValue = -651946363 ) - @Export("modelId2") int modelId2; @ObfuscatedName("ba") @ObfuscatedGetter( intValue = 1530355915 ) - @Export("sequenceId") public int sequenceId; @ObfuscatedName("bm") @ObfuscatedGetter( intValue = 1814107681 ) - @Export("sequenceId2") public int sequenceId2; @ObfuscatedName("bd") @ObfuscatedGetter( intValue = 1684215659 ) - @Export("modelOffsetX") public int modelOffsetX; @ObfuscatedName("bb") @ObfuscatedGetter( intValue = -2011277719 ) - @Export("modelOffsetY") public int modelOffsetY; @ObfuscatedName("bx") @ObfuscatedGetter( intValue = -1767129155 ) - @Export("modelAngleX") public int modelAngleX; @ObfuscatedName("bq") @ObfuscatedGetter( intValue = 21691605 ) - @Export("modelAngleY") public int modelAngleY; @ObfuscatedName("by") @ObfuscatedGetter( intValue = 1295427891 ) - @Export("modelAngleZ") public int modelAngleZ; @ObfuscatedName("bo") @ObfuscatedGetter( intValue = 1679520267 ) - @Export("modelZoom") public int modelZoom; @ObfuscatedName("bk") @ObfuscatedGetter( @@ -375,79 +314,62 @@ public class Widget extends Node { ) public int field2633; @ObfuscatedName("bf") - @Export("modelOrthog") public boolean modelOrthog; @ObfuscatedName("bt") - @Export("modelTransparency") public boolean modelTransparency; @ObfuscatedName("bs") @ObfuscatedGetter( intValue = 1750770011 ) - @Export("itemQuantityMode") public int itemQuantityMode; @ObfuscatedName("cg") @ObfuscatedGetter( intValue = 228754721 ) - @Export("fontId") public int fontId; @ObfuscatedName("ca") - @Export("text") public String text; @ObfuscatedName("ct") - @Export("text2") public String text2; @ObfuscatedName("cv") @ObfuscatedGetter( intValue = 22170567 ) - @Export("textLineHeight") public int textLineHeight; @ObfuscatedName("ce") @ObfuscatedGetter( intValue = 372737821 ) - @Export("textXAlignment") public int textXAlignment; @ObfuscatedName("cr") @ObfuscatedGetter( intValue = 188319241 ) - @Export("textYAlignment") public int textYAlignment; @ObfuscatedName("cn") - @Export("textShadowed") public boolean textShadowed; @ObfuscatedName("ci") @ObfuscatedGetter( intValue = 1239558509 ) - @Export("paddingX") public int paddingX; @ObfuscatedName("cm") @ObfuscatedGetter( intValue = 684939999 ) - @Export("paddingY") public int paddingY; @ObfuscatedName("cu") - @Export("inventoryXOffsets") public int[] inventoryXOffsets; @ObfuscatedName("cw") - @Export("inventoryYOffsets") public int[] inventoryYOffsets; @ObfuscatedName("cq") - @Export("inventorySprites") public int[] inventorySprites; @ObfuscatedName("cc") - @Export("itemActions") public String[] itemActions; @ObfuscatedName("cf") @ObfuscatedGetter( intValue = 1387630371 ) - @Export("flags") public int flags; @ObfuscatedName("cj") public boolean field2676; @@ -460,192 +382,139 @@ public class Widget extends Node { @ObfuscatedName("co") public int[] field2683; @ObfuscatedName("dx") - @Export("dataText") public String dataText; @ObfuscatedName("dq") - @Export("actions") public String[] actions; @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "Lhq;" ) - @Export("parent") public Widget parent; @ObfuscatedName("dh") @ObfuscatedGetter( intValue = -1668184029 ) - @Export("dragZoneSize") public int dragZoneSize; @ObfuscatedName("dd") @ObfuscatedGetter( intValue = -1282838075 ) - @Export("dragThreshold") public int dragThreshold; @ObfuscatedName("db") - @Export("isScrollBar") public boolean isScrollBar; @ObfuscatedName("dj") - @Export("spellActionName") public String spellActionName; @ObfuscatedName("dk") - @Export("hasListener") public boolean hasListener; @ObfuscatedName("de") - @Export("onLoad") public Object[] onLoad; @ObfuscatedName("da") - @Export("onClick") public Object[] onClick; @ObfuscatedName("dr") - @Export("onClickRepeat") public Object[] onClickRepeat; @ObfuscatedName("dw") - @Export("onRelease") public Object[] onRelease; @ObfuscatedName("dy") - @Export("onHold") public Object[] onHold; @ObfuscatedName("ds") - @Export("onMouseOver") public Object[] onMouseOver; @ObfuscatedName("dl") - @Export("onMouseRepeat") public Object[] onMouseRepeat; @ObfuscatedName("di") - @Export("onMouseLeave") public Object[] onMouseLeave; @ObfuscatedName("do") - @Export("onDrag") public Object[] onDrag; @ObfuscatedName("df") - @Export("onDragComplete") public Object[] onDragComplete; @ObfuscatedName("dm") - @Export("onTargetEnter") public Object[] onTargetEnter; @ObfuscatedName("du") - @Export("onTargetLeave") public Object[] onTargetLeave; @ObfuscatedName("dc") - @Export("onVarTransmit") public Object[] onVarTransmit; @ObfuscatedName("dn") - @Export("varTransmitTriggers") public int[] varTransmitTriggers; @ObfuscatedName("dz") - @Export("onInvTransmit") public Object[] onInvTransmit; @ObfuscatedName("dp") - @Export("invTransmitTriggers") public int[] invTransmitTriggers; @ObfuscatedName("dt") - @Export("onStatTransmit") public Object[] onStatTransmit; @ObfuscatedName("dg") - @Export("statTransmitTriggers") public int[] statTransmitTriggers; @ObfuscatedName("ee") - @Export("onTimer") public Object[] onTimer; @ObfuscatedName("en") - @Export("onOp") public Object[] onOp; @ObfuscatedName("eu") - @Export("onScroll") public Object[] onScroll; @ObfuscatedName("eo") - @Export("onChatTransmit") public Object[] onChatTransmit; @ObfuscatedName("es") - @Export("onKey") public Object[] onKey; @ObfuscatedName("ek") - @Export("onFriendTransmit") public Object[] onFriendTransmit; @ObfuscatedName("er") - @Export("onClanTransmit") public Object[] onClanTransmit; @ObfuscatedName("ep") - @Export("onMiscTransmit") public Object[] onMiscTransmit; @ObfuscatedName("eg") - @Export("onDialogAbort") public Object[] onDialogAbort; @ObfuscatedName("eq") - @Export("onSubChange") public Object[] onSubChange; @ObfuscatedName("em") - @Export("onResize") public Object[] onResize; @ObfuscatedName("eh") - @Export("onStockTransmit") public Object[] onStockTransmit; @ObfuscatedName("ec") public Object[] field2722; @ObfuscatedName("ej") - @Export("cs1Instructions") public int[][] cs1Instructions; @ObfuscatedName("ez") - @Export("cs1Comparisons") public int[] cs1Comparisons; @ObfuscatedName("eb") - @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; @ObfuscatedName("et") @ObfuscatedGetter( intValue = -1041425319 ) - @Export("mouseOverRedirect") public int mouseOverRedirect; @ObfuscatedName("ef") - @Export("spellName") public String spellName; @ObfuscatedName("ey") - @Export("buttonText") public String buttonText; @ObfuscatedName("ew") - @Export("itemIds") public int[] itemIds; @ObfuscatedName("ex") - @Export("itemQuantities") public int[] itemQuantities; @ObfuscatedName("ed") @ObfuscatedGetter( intValue = -419140007 ) - @Export("itemId") public int itemId; @ObfuscatedName("ev") @ObfuscatedGetter( intValue = -239895029 ) - @Export("itemQuantity") public int itemQuantity; @ObfuscatedName("ei") @ObfuscatedGetter( intValue = -844392783 ) - @Export("modelFrame") public int modelFrame; @ObfuscatedName("el") @ObfuscatedGetter( intValue = -450327171 ) - @Export("modelFrameCycle") public int modelFrameCycle; @ObfuscatedName("ea") @ObfuscatedSignature( descriptor = "[Lhq;" ) - @Export("children") public Widget[] children; @ObfuscatedName("fq") - @Export("containsMouse") public boolean containsMouse; @ObfuscatedName("fx") - @Export("isClicked") public boolean isClicked; @ObfuscatedName("fp") @ObfuscatedGetter( @@ -671,24 +540,19 @@ public class Widget extends Node { @ObfuscatedGetter( intValue = -390238451 ) - @Export("rootIndex") public int rootIndex; @ObfuscatedName("fk") @ObfuscatedGetter( intValue = 1135189541 ) - @Export("cycle") public int cycle; @ObfuscatedName("fe") public int[] field2661; @ObfuscatedName("fb") - @Export("noClickThrough") public boolean noClickThrough; @ObfuscatedName("fc") - @Export("noScrollThrough") public boolean noScrollThrough; @ObfuscatedName("fm") - @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { @@ -801,7 +665,6 @@ public class Widget extends Node { descriptor = "(Lkf;B)V", garbageValue = "-56" ) - @Export("decodeLegacy") void decodeLegacy(Buffer var1) { this.isIf3 = false; this.type = var1.readUnsignedByte(); // L: 244 @@ -1058,7 +921,6 @@ public class Widget extends Node { descriptor = "(Lkf;I)V", garbageValue = "-1100284620" ) - @Export("decode") void decode(Buffer var1) { var1.readUnsignedByte(); // L: 408 this.isIf3 = true; // L: 409 @@ -1200,7 +1062,6 @@ public class Widget extends Node { descriptor = "(Lkf;I)[Ljava/lang/Object;", garbageValue = "1410086858" ) - @Export("readListener") Object[] readListener(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 514 if (var2 == 0) { // L: 515 @@ -1227,7 +1088,6 @@ public class Widget extends Node { descriptor = "(Lkf;I)[I", garbageValue = "931068469" ) - @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 527 if (var2 == 0) { // L: 528 @@ -1248,7 +1108,6 @@ public class Widget extends Node { descriptor = "(III)V", garbageValue = "1248652086" ) - @Export("swapItems") public void swapItems(int var1, int var2) { int var3 = this.itemIds[var2]; // L: 537 this.itemIds[var2] = this.itemIds[var1]; // L: 538 @@ -1263,7 +1122,6 @@ public class Widget extends Node { descriptor = "(ZB)Llp;", garbageValue = "-13" ) - @Export("getSprite") public Sprite getSprite(boolean var1) { field2611 = false; // L: 546 int var2; @@ -1322,7 +1180,6 @@ public class Widget extends Node { descriptor = "(I)Lkr;", garbageValue = "-5714739" ) - @Export("getFont") public Font getFont() { field2611 = false; // L: 570 if (this.fontId == -1) { // L: 571 @@ -1349,7 +1206,6 @@ public class Widget extends Node { descriptor = "(IB)Llp;", garbageValue = "45" ) - @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { field2611 = false; // L: 581 if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 582 @@ -1381,7 +1237,6 @@ public class Widget extends Node { descriptor = "(Ljm;IZLha;I)Ler;", garbageValue = "-1710688056" ) - @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { field2611 = false; // L: 594 int var5; @@ -1463,7 +1318,6 @@ public class Widget extends Node { descriptor = "(ZI)Lhz;", garbageValue = "1282321676" ) - @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { if (this.spriteId == -1) { // L: 653 var1 = false; @@ -1522,7 +1376,6 @@ public class Widget extends Node { descriptor = "(ILjava/lang/String;I)V", garbageValue = "-1337078024" ) - @Export("setAction") public void setAction(int var1, String var2) { if (this.actions == null || this.actions.length <= var1) { // L: 695 String[] var3 = new String[var1 + 1]; // L: 696 diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index a987de59d1..76f7d7ca74 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,55 +10,44 @@ public class World { @ObfuscatedGetter( intValue = 1992113923 ) - @Export("World_count") static int World_count; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 1564802557 ) - @Export("World_listCount") static int World_listCount; @ObfuscatedName("w") - @Export("World_sortOption2") static int[] World_sortOption2; @ObfuscatedName("g") - @Export("World_sortOption1") static int[] World_sortOption1; @ObfuscatedName("n") @ObfuscatedGetter( intValue = 1790821377 ) - @Export("id") int id; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -370098411 ) - @Export("properties") int properties; @ObfuscatedName("h") @ObfuscatedGetter( intValue = 1089553333 ) - @Export("population") int population; @ObfuscatedName("a") - @Export("host") String host; @ObfuscatedName("q") - @Export("activity") String activity; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -82869953 ) - @Export("location") int location; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1577335433 ) - @Export("index") int index; static { @@ -77,7 +65,6 @@ public class World { descriptor = "(B)Z", garbageValue = "17" ) - @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; // L: 247 } @@ -96,7 +83,6 @@ public class World { descriptor = "(I)Z", garbageValue = "1058529393" ) - @Export("isPvp") boolean isPvp() { return (4 & this.properties) != 0; // L: 255 } @@ -115,7 +101,6 @@ public class World { descriptor = "(B)Z", garbageValue = "-101" ) - @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; // L: 263 } @@ -125,7 +110,6 @@ public class World { descriptor = "(I)Z", garbageValue = "-249036975" ) - @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; // L: 267 } @@ -144,7 +128,6 @@ public class World { descriptor = "(Ljava/lang/CharSequence;I)Z", garbageValue = "-1732366534" ) - @Export("isNumber") public static boolean isNumber(CharSequence var0) { return class92.method2141(var0, 10, true); // L: 34 } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 5e29e605c4..6a41c3436e 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -17,67 +16,55 @@ public class WorldMap { @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("fontNameVerdana11") static final FontName fontNameVerdana11; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("fontNameVerdana13") static final FontName fontNameVerdana13; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "Lkz;" ) - @Export("fontNameVerdana15") static final FontName fontNameVerdana15; @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("WorldMap_archive") AbstractArchive WorldMap_archive; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "Lkr;" ) - @Export("font") Font font; @ObfuscatedName("a") - @Export("fonts") HashMap fonts; @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; @ObfuscatedName("c") - @Export("details") HashMap details; @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Lar;" ) - @Export("mainMapArea") WorldMapArea mainMapArea; @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "Lar;" ) - @Export("currentMapArea") WorldMapArea currentMapArea; @ObfuscatedName("v") @ObfuscatedSignature( @@ -88,97 +75,79 @@ public class WorldMap { @ObfuscatedSignature( descriptor = "Lai;" ) - @Export("worldMapManager") WorldMapManager worldMapManager; @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "Lmd;" ) - @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; @ObfuscatedName("u") @ObfuscatedGetter( intValue = -611163949 ) - @Export("centerTileX") int centerTileX; @ObfuscatedName("p") @ObfuscatedGetter( intValue = -1065399067 ) - @Export("centerTileY") int centerTileY; @ObfuscatedName("b") @ObfuscatedGetter( intValue = -681769299 ) - @Export("worldMapTargetX") int worldMapTargetX; @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1693054595 ) - @Export("worldMapTargetY") int worldMapTargetY; @ObfuscatedName("e") - @Export("zoom") float zoom; @ObfuscatedName("ab") - @Export("zoomTarget") float zoomTarget; @ObfuscatedName("ag") @ObfuscatedGetter( intValue = 1569686885 ) - @Export("worldMapDisplayWidth") int worldMapDisplayWidth; @ObfuscatedName("ao") @ObfuscatedGetter( intValue = 358605679 ) - @Export("worldMapDisplayHeight") int worldMapDisplayHeight; @ObfuscatedName("ae") @ObfuscatedGetter( intValue = -2122847541 ) - @Export("worldMapDisplayX") int worldMapDisplayX; @ObfuscatedName("an") @ObfuscatedGetter( intValue = -2116246555 ) - @Export("worldMapDisplayY") int worldMapDisplayY; @ObfuscatedName("am") @ObfuscatedGetter( intValue = 52853051 ) - @Export("maxFlashCount") int maxFlashCount; @ObfuscatedName("ap") @ObfuscatedGetter( intValue = 1639517063 ) - @Export("cyclesPerFlash") int cyclesPerFlash; @ObfuscatedName("au") - @Export("perpetualFlash") boolean perpetualFlash; @ObfuscatedName("aa") - @Export("flashingElements") HashSet flashingElements; @ObfuscatedName("ar") @ObfuscatedGetter( intValue = 1602251249 ) - @Export("flashCount") int flashCount; @ObfuscatedName("at") @ObfuscatedGetter( intValue = -1930209769 ) - @Export("flashCycle") int flashCycle; @ObfuscatedName("aq") @ObfuscatedGetter( @@ -218,18 +187,14 @@ public class WorldMap { @ObfuscatedName("ad") boolean field4021; @ObfuscatedName("aj") - @Export("enabledElements") HashSet enabledElements; @ObfuscatedName("aw") - @Export("enabledCategories") HashSet enabledCategories; @ObfuscatedName("af") - @Export("enabledElementIds") HashSet enabledElementIds; @ObfuscatedName("ak") HashSet field4025; @ObfuscatedName("ac") - @Export("elementsDisabled") boolean elementsDisabled; @ObfuscatedName("bl") @ObfuscatedGetter( @@ -237,12 +202,10 @@ public class WorldMap { ) int field4027; @ObfuscatedName("bz") - @Export("menuOpcodes") final int[] menuOpcodes; @ObfuscatedName("bj") List field4029; @ObfuscatedName("bh") - @Export("iconIterator") Iterator iconIterator; @ObfuscatedName("bi") HashSet field4007; @@ -250,34 +213,28 @@ public class WorldMap { @ObfuscatedSignature( descriptor = "Lhg;" ) - @Export("mouseCoord") Coord mouseCoord; @ObfuscatedName("br") - @Export("showCoord") public boolean showCoord; @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("sprite") Sprite sprite; @ObfuscatedName("bn") @ObfuscatedGetter( intValue = -1176520287 ) - @Export("cachedPixelsPerTile") int cachedPixelsPerTile; @ObfuscatedName("bw") @ObfuscatedGetter( intValue = 627351645 ) - @Export("minCachedTileX") int minCachedTileX; @ObfuscatedName("be") @ObfuscatedGetter( intValue = 357245399 ) - @Export("minCachedTileY") int minCachedTileY; @ObfuscatedName("bu") @ObfuscatedGetter( @@ -329,7 +286,6 @@ public class WorldMap { descriptor = "(Lic;Lic;Lic;Lkr;Ljava/util/HashMap;[Lls;I)V", garbageValue = "-926248913" ) - @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { this.mapSceneSprites = var6; // L: 105 this.WorldMap_archive = var1; // L: 106 @@ -373,7 +329,6 @@ public class WorldMap { descriptor = "(IIZIIIII)V", garbageValue = "-1994141756" ) - @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { if (this.cacheLoader.isLoaded()) { // L: 138 this.smoothZoom(); // L: 141 @@ -490,7 +445,6 @@ public class WorldMap { descriptor = "(I)V", garbageValue = "1666598951" ) - @Export("smoothZoom") void smoothZoom() { if (ModelData0.field1901 != null) { // L: 238 this.zoom = this.zoomTarget; // L: 239 @@ -511,7 +465,6 @@ public class WorldMap { descriptor = "(B)V", garbageValue = "1" ) - @Export("scrollToTarget") void scrollToTarget() { if (this.hasTarget()) { // L: 251 int var1 = this.worldMapTargetX - this.centerTileX; // L: 254 @@ -538,7 +491,6 @@ public class WorldMap { descriptor = "(IIZI)V", garbageValue = "1721878015" ) - @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; // L: 270 this.centerTileY = var2; // L: 271 @@ -566,7 +518,6 @@ public class WorldMap { descriptor = "(I)Z", garbageValue = "2112762378" ) - @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284 } @@ -576,7 +527,6 @@ public class WorldMap { descriptor = "(IIIB)Lar;", garbageValue = "-8" ) - @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { Iterator var4 = this.details.values().iterator(); // L: 288 @@ -625,7 +575,6 @@ public class WorldMap { descriptor = "(IB)V", garbageValue = "-5" ) - @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { WorldMapArea var2 = this.getMapArea(var1); // L: 319 if (var2 != null) { // L: 320 @@ -639,7 +588,6 @@ public class WorldMap { descriptor = "(B)I", garbageValue = "84" ) - @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329 } @@ -649,7 +597,6 @@ public class WorldMap { descriptor = "(B)Lar;", garbageValue = "-64" ) - @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; // L: 333 } @@ -659,7 +606,6 @@ public class WorldMap { descriptor = "(Lar;I)V", garbageValue = "65867668" ) - @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337 this.initializeWorldMapManager(var1); // L: 340 @@ -672,7 +618,6 @@ public class WorldMap { descriptor = "(Lar;I)V", garbageValue = "-1701354489" ) - @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { this.currentMapArea = var1; // L: 345 this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 346 @@ -704,7 +649,6 @@ public class WorldMap { descriptor = "(IIIB)V", garbageValue = "-6" ) - @Export("jump") void jump(int var1, int var2, int var3) { if (this.currentMapArea != null) { // L: 366 int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 369 @@ -728,7 +672,6 @@ public class WorldMap { descriptor = "(IIIIII)V", garbageValue = "1145142542" ) - @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { int[] var6 = new int[4]; // L: 384 Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 385 @@ -854,7 +797,6 @@ public class WorldMap { descriptor = "(IIIIB)V", garbageValue = "-31" ) - @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { if (this.cacheLoader.isLoaded()) { // L: 475 if (!this.worldMapManager.isLoaded()) { // L: 478 @@ -873,7 +815,6 @@ public class WorldMap { descriptor = "(II)V", garbageValue = "-1877509796" ) - @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488 } // L: 489 @@ -883,7 +824,6 @@ public class WorldMap { descriptor = "(IIIIII)V", garbageValue = "-1108867958" ) - @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { byte var6 = 20; // L: 492 int var7 = var3 / 2 + var1; // L: 493 @@ -899,7 +839,6 @@ public class WorldMap { descriptor = "(IB)F", garbageValue = "55" ) - @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { if (var1 == 25) { // L: 502 return 1.0F; @@ -919,7 +858,6 @@ public class WorldMap { descriptor = "(I)I", garbageValue = "-1167531031" ) - @Export("getZoomLevel") public int getZoomLevel() { if (1.0D == (double)this.zoomTarget) { // L: 511 return 25; @@ -939,7 +877,6 @@ public class WorldMap { descriptor = "(I)V", garbageValue = "-1132818911" ) - @Export("loadCache") public void loadCache() { this.cacheLoader.load(); // L: 520 } // L: 521 @@ -949,7 +886,6 @@ public class WorldMap { descriptor = "(I)Z", garbageValue = "-683321726" ) - @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); // L: 524 } @@ -959,7 +895,6 @@ public class WorldMap { descriptor = "(II)Lar;", garbageValue = "-1578034984" ) - @Export("getMapArea") public WorldMapArea getMapArea(int var1) { Iterator var2 = this.details.values().iterator(); // L: 528 @@ -980,7 +915,6 @@ public class WorldMap { descriptor = "(III)V", garbageValue = "-1263582707" ) - @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 540 this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 543 @@ -993,7 +927,6 @@ public class WorldMap { descriptor = "(IIB)V", garbageValue = "-39" ) - @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { if (this.currentMapArea != null) { // L: 548 this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 551 @@ -1007,7 +940,6 @@ public class WorldMap { descriptor = "(IIII)V", garbageValue = "1993790921" ) - @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { if (this.currentMapArea != null) { // L: 557 int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 560 @@ -1023,7 +955,6 @@ public class WorldMap { descriptor = "(IIII)V", garbageValue = "-367968117" ) - @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { if (this.currentMapArea != null) { // L: 567 int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 570 @@ -1039,7 +970,6 @@ public class WorldMap { descriptor = "(I)I", garbageValue = "1157589126" ) - @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580 } @@ -1049,7 +979,6 @@ public class WorldMap { descriptor = "(I)I", garbageValue = "423694608" ) - @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587 } @@ -1059,7 +988,6 @@ public class WorldMap { descriptor = "(I)Lhg;", garbageValue = "1327996030" ) - @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594 } @@ -1069,7 +997,6 @@ public class WorldMap { descriptor = "(I)I", garbageValue = "-1261786031" ) - @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; // L: 598 } @@ -1079,7 +1006,6 @@ public class WorldMap { descriptor = "(I)I", garbageValue = "-2040090881" ) - @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; // L: 602 } @@ -1089,7 +1015,6 @@ public class WorldMap { descriptor = "(IB)V", garbageValue = "-83" ) - @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { if (var1 >= 1) { // L: 606 this.maxFlashCount = var1; // L: 607 @@ -1102,7 +1027,6 @@ public class WorldMap { descriptor = "(B)V", garbageValue = "119" ) - @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; // L: 612 } // L: 613 @@ -1112,7 +1036,6 @@ public class WorldMap { descriptor = "(II)V", garbageValue = "147371535" ) - @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { if (var1 >= 1) { // L: 616 this.cyclesPerFlash = var1; // L: 617 @@ -1125,7 +1048,6 @@ public class WorldMap { descriptor = "(I)V", garbageValue = "561976387" ) - @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; // L: 622 } // L: 623 @@ -1135,7 +1057,6 @@ public class WorldMap { descriptor = "(ZB)V", garbageValue = "36" ) - @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; // L: 626 } // L: 627 @@ -1145,7 +1066,6 @@ public class WorldMap { descriptor = "(IB)V", garbageValue = "-1" ) - @Export("flashElement") public void flashElement(int var1) { this.flashingElements = new HashSet(); // L: 630 this.flashingElements.add(var1); // L: 631 @@ -1158,7 +1078,6 @@ public class WorldMap { descriptor = "(IB)V", garbageValue = "0" ) - @Export("flashCategory") public void flashCategory(int var1) { this.flashingElements = new HashSet(); // L: 637 this.flashCount = 0; // L: 638 @@ -1177,7 +1096,6 @@ public class WorldMap { descriptor = "(I)V", garbageValue = "578188764" ) - @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; // L: 651 } // L: 652 @@ -1187,7 +1105,6 @@ public class WorldMap { descriptor = "(ZI)V", garbageValue = "-805542752" ) - @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; // L: 655 } // L: 656 @@ -1197,7 +1114,6 @@ public class WorldMap { descriptor = "(IZS)V", garbageValue = "5539" ) - @Export("disableElement") public void disableElement(int var1, boolean var2) { if (!var2) { // L: 659 this.enabledElements.add(var1); // L: 660 @@ -1213,7 +1129,6 @@ public class WorldMap { descriptor = "(IZS)V", garbageValue = "3311" ) - @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { if (!var2) { // L: 669 this.enabledCategories.add(var1); // L: 670 @@ -1240,7 +1155,6 @@ public class WorldMap { descriptor = "(I)Z", garbageValue = "-1921316185" ) - @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; // L: 693 } @@ -1250,7 +1164,6 @@ public class WorldMap { descriptor = "(II)Z", garbageValue = "1781251597" ) - @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); // L: 697 } @@ -1260,7 +1173,6 @@ public class WorldMap { descriptor = "(II)Z", garbageValue = "1674259718" ) - @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); // L: 701 } @@ -1281,7 +1193,6 @@ public class WorldMap { descriptor = "(IIIIIIB)V", garbageValue = "49" ) - @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { // L: 711 int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 714 @@ -1363,7 +1274,6 @@ public class WorldMap { descriptor = "(IILhg;Lhg;I)V", garbageValue = "-2008216886" ) - @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { ScriptEvent var5 = new ScriptEvent(); // L: 774 WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 775 @@ -1393,7 +1303,6 @@ public class WorldMap { descriptor = "(I)Laz;", garbageValue = "-710181196" ) - @Export("iconStart") public AbstractWorldMapIcon iconStart() { if (!this.cacheLoader.isLoaded()) { // L: 808 return null; // L: 809 @@ -1419,7 +1328,6 @@ public class WorldMap { descriptor = "(S)Laz;", garbageValue = "-2586" ) - @Export("iconNext") public AbstractWorldMapIcon iconNext() { if (this.iconIterator == null) { // L: 827 return null; // L: 828 diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index cae31e4bd6..cc03b32e59 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,22 +7,18 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { @ObfuscatedName("i") - @Export("cacheName") String cacheName; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("archive") AbstractArchive archive; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 2018598251 ) - @Export("percentLoaded") int percentLoaded; @ObfuscatedName("w") - @Export("loaded") boolean loaded; @ObfuscatedSignature( @@ -40,7 +35,6 @@ public class WorldMapArchiveLoader { descriptor = "(Ljava/lang/String;I)V", garbageValue = "1155527039" ) - @Export("reset") void reset(String var1) { if (var1 != null && !var1.isEmpty()) { // L: 21 if (var1 != this.cacheName) { // L: 24 @@ -57,7 +51,6 @@ public class WorldMapArchiveLoader { descriptor = "(I)I", garbageValue = "-739480731" ) - @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field318.name, this.cacheName)) { // L: 35 @@ -92,7 +85,6 @@ public class WorldMapArchiveLoader { descriptor = "(I)Z", garbageValue = "-337934116" ) - @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } @@ -102,7 +94,6 @@ public class WorldMapArchiveLoader { descriptor = "(B)I", garbageValue = "-64" ) - @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; // L: 63 } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 382fd63d92..7b5adc1e5b 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,6 +1,5 @@ import java.util.Iterator; import java.util.LinkedList; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -14,67 +13,54 @@ public class WorldMapArea { @ObfuscatedSignature( descriptor = "Lmr;" ) - @Export("platformInfo") static PlatformInfo platformInfo; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -2004467599 ) - @Export("id") int id; @ObfuscatedName("k") - @Export("internalName") String internalName; @ObfuscatedName("s") - @Export("externalName") String externalName; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 173771503 ) - @Export("backGroundColor") int backGroundColor; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1585723591 ) - @Export("zoom") int zoom; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lhg;" ) - @Export("origin") Coord origin; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -2050801149 ) - @Export("regionLowX") int regionLowX; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1803706305 ) - @Export("regionHighX") int regionHighX; @ObfuscatedName("g") @ObfuscatedGetter( intValue = 2137946489 ) - @Export("regionLowY") int regionLowY; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1133866307 ) - @Export("regionHighY") int regionHighY; @ObfuscatedName("n") - @Export("isMain") boolean isMain; @ObfuscatedName("d") - @Export("sections") LinkedList sections; public WorldMapArea() { @@ -94,7 +80,6 @@ public class WorldMapArea { descriptor = "(Lkf;IB)V", garbageValue = "24" ) - @Export("read") public void read(Buffer var1, int var2) { this.id = var2; // L: 23 this.internalName = var1.readStringCp1252NullTerminated(); // L: 24 @@ -119,7 +104,6 @@ public class WorldMapArea { descriptor = "(Lkf;B)Lay;", garbageValue = "-55" ) - @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 40 WorldMapSectionType var3 = (WorldMapSectionType)TextureProvider.findEnumerated(WorldMapSectionType.method327(), var2); // L: 41 @@ -150,7 +134,6 @@ public class WorldMapArea { descriptor = "(IIIB)Z", garbageValue = "31" ) - @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { Iterator var4 = this.sections.iterator(); // L: 64 @@ -171,7 +154,6 @@ public class WorldMapArea { descriptor = "(IIB)Z", garbageValue = "118" ) - @Export("containsPosition") public boolean containsPosition(int var1, int var2) { int var3 = var1 / 64; // L: 76 int var4 = var2 / 64; // L: 77 @@ -202,7 +184,6 @@ public class WorldMapArea { descriptor = "(IIII)[I", garbageValue = "-1676257391" ) - @Export("position") public int[] position(int var1, int var2, int var3) { Iterator var4 = this.sections.iterator(); // L: 92 @@ -223,7 +204,6 @@ public class WorldMapArea { descriptor = "(III)Lhg;", garbageValue = "788821782" ) - @Export("coord") public Coord coord(int var1, int var2) { Iterator var3 = this.sections.iterator(); // L: 104 @@ -244,7 +224,6 @@ public class WorldMapArea { descriptor = "(I)V", garbageValue = "-1087000802" ) - @Export("setBounds") void setBounds() { Iterator var1 = this.sections.iterator(); // L: 116 @@ -260,7 +239,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "809929326" ) - @Export("getId") public int getId() { return this.id; // L: 125 } @@ -270,7 +248,6 @@ public class WorldMapArea { descriptor = "(I)Z", garbageValue = "-1492211356" ) - @Export("getIsMain") public boolean getIsMain() { return this.isMain; // L: 129 } @@ -280,7 +257,6 @@ public class WorldMapArea { descriptor = "(I)Ljava/lang/String;", garbageValue = "-401502532" ) - @Export("getInternalName") public String getInternalName() { return this.internalName; // L: 133 } @@ -290,7 +266,6 @@ public class WorldMapArea { descriptor = "(S)Ljava/lang/String;", garbageValue = "-32528" ) - @Export("getExternalName") public String getExternalName() { return this.externalName; // L: 137 } @@ -300,7 +275,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "194013380" ) - @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; // L: 141 } @@ -310,7 +284,6 @@ public class WorldMapArea { descriptor = "(B)I", garbageValue = "24" ) - @Export("getZoom") public int getZoom() { return this.zoom; // L: 145 } @@ -320,7 +293,6 @@ public class WorldMapArea { descriptor = "(B)I", garbageValue = "63" ) - @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; // L: 149 } @@ -330,7 +302,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "-691462213" ) - @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; // L: 153 } @@ -340,7 +311,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "-515564038" ) - @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; // L: 157 } @@ -350,7 +320,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "330383709" ) - @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; // L: 161 } @@ -360,7 +329,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "1099952817" ) - @Export("getOriginX") public int getOriginX() { return this.origin.x; // L: 165 } @@ -370,7 +338,6 @@ public class WorldMapArea { descriptor = "(B)I", garbageValue = "8" ) - @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; // L: 169 } @@ -380,7 +347,6 @@ public class WorldMapArea { descriptor = "(I)I", garbageValue = "2050944019" ) - @Export("getOriginY") public int getOriginY() { return this.origin.y; // L: 173 } @@ -390,7 +356,6 @@ public class WorldMapArea { descriptor = "(B)Lhg;", garbageValue = "0" ) - @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); // L: 177 } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 2c17096934..f9cb410805 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -2,7 +2,6 @@ import java.awt.Component; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -15,7 +14,6 @@ public class WorldMapAreaData extends WorldMapArea { @ObfuscatedSignature( descriptor = "Lmu;" ) - @Export("loginType") static LoginType loginType; @ObfuscatedName("ey") @ObfuscatedGetter( @@ -23,13 +21,10 @@ public class WorldMapAreaData extends WorldMapArea { ) static int field352; @ObfuscatedName("h") - @Export("worldMapData0Set") HashSet worldMapData0Set; @ObfuscatedName("a") - @Export("worldMapData1Set") HashSet worldMapData1Set; @ObfuscatedName("q") - @Export("iconList") List iconList; WorldMapAreaData() { @@ -40,7 +35,6 @@ public class WorldMapAreaData extends WorldMapArea { descriptor = "(Lkf;Lkf;IZB)V", garbageValue = "1" ) - @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); // L: 17 int var5 = var2.readUnsignedShort(); // L: 18 @@ -82,7 +76,6 @@ public class WorldMapAreaData extends WorldMapArea { descriptor = "(Lkf;ZS)V", garbageValue = "8691" ) - @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { this.iconList = new LinkedList(); int var3 = var1.readUnsignedShort(); @@ -115,7 +108,6 @@ public class WorldMapAreaData extends WorldMapArea { descriptor = "(II)Ljava/lang/String;", garbageValue = "638484007" ) - @Export("colorStartTag") static String colorStartTag(int var0) { return ""; // L: 22 } @@ -322,7 +314,6 @@ public class WorldMapAreaData extends WorldMapArea { descriptor = "(I)V", garbageValue = "-1654311283" ) - @Export("addCancelMenuEntry") static void addCancelMenuEntry() { class279.method5091(); // L: 7009 Client.menuActions[0] = "Cancel"; // L: 7010 @@ -337,7 +328,6 @@ public class WorldMapAreaData extends WorldMapArea { descriptor = "([Lhq;II)V", garbageValue = "1802029198" ) - @Export("runComponentCloseListeners") static final void runComponentCloseListeners(Widget[] var0, int var1) { for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10115 Widget var3 = var0[var2]; // L: 10116 diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index f2d5321c10..474036722f 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -32,7 +31,6 @@ public class WorldMapCacheName { ) public static final WorldMapCacheName field321; @ObfuscatedName("o") - @Export("name") public final String name; static { @@ -52,7 +50,6 @@ public class WorldMapCacheName { descriptor = "(IIB)Lbk;", garbageValue = "-87" ) - @Export("Messages_getByChannelAndID") static Message Messages_getByChannelAndID(int var0, int var1) { ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 return var2.getMessage(var1); // L: 36 @@ -63,7 +60,6 @@ public class WorldMapCacheName { descriptor = "(II)V", garbageValue = "1002606295" ) - @Export("playSong") static void playSong(int var0) { if (var0 == -1 && !Client.field704) { // L: 3288 class206.midiPcmStream.clear(); // L: 3290 diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index c2a8e17ac8..030b406454 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -1,7 +1,6 @@ import java.awt.Desktop; import java.awt.Desktop.Action; import java.net.URI; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -17,7 +16,6 @@ public class WorldMapData_0 extends AbstractWorldMapData { descriptor = "(Lkf;B)V", garbageValue = "29" ) - @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 if (var2 != WorldMapID.field291.value) { // L: 10 @@ -39,7 +37,6 @@ public class WorldMapData_0 extends AbstractWorldMapData { descriptor = "(Lkf;I)V", garbageValue = "728123848" ) - @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; @@ -84,7 +81,6 @@ public class WorldMapData_0 extends AbstractWorldMapData { descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", garbageValue = "-379441451" ) - @Export("addChatMessage") static void addChatMessage(int var0, String var1, String var2, String var3) { ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 if (var4 == null) { // L: 24 diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 817d34f452..883d3456ae 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -2,7 +2,6 @@ import java.io.IOException; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -15,31 +14,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive19") static Archive archive19; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -1032395207 ) - @Export("chunkXLow") int chunkXLow; @ObfuscatedName("f") @ObfuscatedGetter( intValue = 1804098781 ) - @Export("chunkYLow") int chunkYLow; @ObfuscatedName("y") @ObfuscatedGetter( intValue = -1816930541 ) - @Export("chunkX") int chunkX; @ObfuscatedName("v") @ObfuscatedGetter( intValue = 875347201 ) - @Export("chunkY") int chunkY; WorldMapData_1() { @@ -50,7 +44,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(Lkf;B)V", garbageValue = "-5" ) - @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 if (var2 != WorldMapID.field288.value) { // L: 15 @@ -76,7 +69,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(Lkf;I)V", garbageValue = "728123848" ) - @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); // L: 33 super.floorUnderlayIds = new short[1][64][64]; // L: 34 @@ -110,7 +102,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(I)I", garbageValue = "-173161380" ) - @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; // L: 73 } @@ -120,7 +111,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(I)I", garbageValue = "-1289176366" ) - @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; // L: 77 } @@ -130,7 +120,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(I)I", garbageValue = "1672760755" ) - @Export("getChunkX") int getChunkX() { return this.chunkX; } @@ -140,7 +129,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(I)I", garbageValue = "-56911987" ) - @Export("getChunkY") int getChunkY() { return this.chunkY; } @@ -167,7 +155,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(B)V", garbageValue = "1" ) - @Export("savePreferences") static void savePreferences() { AccessFile var0 = null; // L: 81 @@ -192,7 +179,6 @@ public class WorldMapData_1 extends AbstractWorldMapData { descriptor = "(I)I", garbageValue = "570960818" ) - @Export("getGcDuration") protected static int getGcDuration() { int var0 = 0; // L: 549 if (WorldMapIcon_0.garbageCollector == null || !WorldMapIcon_0.garbageCollector.isValid()) { // L: 550 diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 48e8093e9a..2d57b7fede 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -1,5 +1,4 @@ import java.io.File; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -13,19 +12,16 @@ public class WorldMapDecoration { @ObfuscatedGetter( intValue = -1951458321 ) - @Export("objectDefinitionId") final int objectDefinitionId; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1622720231 ) - @Export("decoration") final int decoration; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 1680868715 ) - @Export("rotation") final int rotation; WorldMapDecoration(int var1, int var2, int var3) { diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index e4262d8811..73ec6e8f98 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -127,7 +126,6 @@ public enum WorldMapDecorationType implements Enumerated { @ObfuscatedGetter( intValue = 212530535 ) - @Export("id") public final int id; @ObfuscatedSignature( @@ -143,7 +141,6 @@ public enum WorldMapDecorationType implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 38 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index df840bc706..8ae6da2ef7 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,46 +10,38 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "[Liv;" ) - @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1742537505 ) - @Export("WorldMapElement_count") public static int WorldMapElement_count; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lel;" ) - @Export("WorldMapElement_cachedSprites") static EvictingDualNodeHashTable WorldMapElement_cachedSprites; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 2104194333 ) - @Export("objectId") public final int objectId; @ObfuscatedName("o") @ObfuscatedGetter( intValue = 1581878653 ) - @Export("sprite1") public int sprite1; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -886122493 ) - @Export("sprite2") int sprite2; @ObfuscatedName("w") - @Export("name") public String name; @ObfuscatedName("g") @ObfuscatedGetter( @@ -61,13 +52,10 @@ public class WorldMapElement extends DualNode { @ObfuscatedGetter( intValue = -1165437927 ) - @Export("textSize") public int textSize; @ObfuscatedName("d") - @Export("menuActions") public String[] menuActions; @ObfuscatedName("h") - @Export("menuTargetName") public String menuTargetName; @ObfuscatedName("a") int[] field3247; @@ -95,13 +83,11 @@ public class WorldMapElement extends DualNode { @ObfuscatedSignature( descriptor = "Lju;" ) - @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "Lit;" ) - @Export("verticalAlignment") public VerticalAlignment verticalAlignment; @ObfuscatedName("r") int[] field3253; @@ -111,7 +97,6 @@ public class WorldMapElement extends DualNode { @ObfuscatedGetter( intValue = 763418107 ) - @Export("category") public int category; static { @@ -138,7 +123,6 @@ public class WorldMapElement extends DualNode { descriptor = "(Lkf;B)V", garbageValue = "-62" ) - @Export("decode") public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 50 @@ -155,7 +139,6 @@ public class WorldMapElement extends DualNode { descriptor = "(Lkf;IB)V", garbageValue = "87" ) - @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 57 this.sprite1 = var1.method5634(); @@ -267,7 +250,6 @@ public class WorldMapElement extends DualNode { descriptor = "(ZI)Llp;", garbageValue = "435474118" ) - @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { int var2 = this.sprite1; // L: 137 return this.getSprite(var2); // L: 138 @@ -278,7 +260,6 @@ public class WorldMapElement extends DualNode { descriptor = "(II)Llp;", garbageValue = "-335461547" ) - @Export("getSprite") Sprite getSprite(int var1) { if (var1 < 0) { // L: 142 return null; @@ -302,7 +283,6 @@ public class WorldMapElement extends DualNode { descriptor = "(B)I", garbageValue = "13" ) - @Export("getObjectId") public int getObjectId() { return this.objectId; // L: 153 } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 3e24291ac5..1affbf54d7 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,19 +10,16 @@ public class WorldMapEvent { @ObfuscatedGetter( intValue = 1732221889 ) - @Export("mapElement") public int mapElement; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lhg;" ) - @Export("coord1") public Coord coord1; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lhg;" ) - @Export("coord2") public Coord coord2; @ObfuscatedSignature( @@ -123,7 +119,6 @@ public class WorldMapEvent { descriptor = "(B)Lct;", garbageValue = "-13" ) - @Export("getNextWorldListWorld") static World getNextWorldListWorld() { return World.World_listCount < World.World_count ? AbstractByteArrayCopier.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 394f8087b2..c550b13bb6 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -1,5 +1,4 @@ import java.security.SecureRandom; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -20,28 +19,23 @@ public class WorldMapID { ) static final WorldMapID field288; @ObfuscatedName("t") - @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 658473583 ) - @Export("clientType") public static int clientType; @ObfuscatedName("dl") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive3") static Archive archive3; @ObfuscatedName("ev") - @Export("secureRandom") static SecureRandom secureRandom; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 563184905 ) - @Export("value") final int value; static { @@ -239,7 +233,6 @@ public class WorldMapID { descriptor = "(ZLky;B)V", garbageValue = "45" ) - @Export("loadRegions") static final void loadRegions(boolean var0, PacketBuffer var1) { Client.isInInstance = var0; // L: 4988 int var2; diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index c8eee089c5..364f753578 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -1,5 +1,4 @@ import java.lang.management.GarbageCollectorMXBean; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -9,13 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedName("ay") - @Export("garbageCollector") static GarbageCollectorMXBean garbageCollector; @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("worldSelectLeftSprite") static IndexedSprite worldSelectLeftSprite; @ObfuscatedName("gl") @ObfuscatedGetter( @@ -26,25 +23,21 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -68382233 ) - @Export("element") final int element; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Laq;" ) - @Export("label") final WorldMapLabel label; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1820517903 ) - @Export("subWidth") final int subWidth; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 877531577 ) - @Export("subHeight") final int subHeight; @ObfuscatedSignature( @@ -71,7 +64,6 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "-1613828162" ) - @Export("getElement") public int getElement() { return this.element; // L: 30 } @@ -81,7 +73,6 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { descriptor = "(I)Laq;", garbageValue = "499378708" ) - @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 34 } @@ -91,7 +82,6 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "182515130" ) - @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 38 } @@ -101,7 +91,6 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "-2001682063" ) - @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 42 } @@ -111,7 +100,6 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { descriptor = "(Lhq;B)I", garbageValue = "-82" ) - @Export("getWidgetFlags") static int getWidgetFlags(Widget var0) { IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 10711 return var1 != null ? var1.integer : var0.flags; // L: 10712 10713 diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 029200d6d9..2d9d8698dd 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -1,6 +1,5 @@ import java.applet.Applet; import java.net.URL; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -20,37 +19,31 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { @ObfuscatedGetter( intValue = -18311555 ) - @Export("objectDefId") final int objectDefId; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lal;" ) - @Export("region") final WorldMapRegion region; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -2141926567 ) - @Export("element") int element; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Laq;" ) - @Export("label") WorldMapLabel label; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 578089951 ) - @Export("subWidth") int subWidth; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -258563275 ) - @Export("subHeight") int subHeight; @ObfuscatedSignature( @@ -68,7 +61,6 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "-1613828162" ) - @Export("getElement") public int getElement() { return this.element; // L: 39 } @@ -78,7 +70,6 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(I)Laq;", garbageValue = "499378708" ) - @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 43 } @@ -88,7 +79,6 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "182515130" ) - @Export("getSubWidth") int getSubWidth() { return this.subWidth; } @@ -98,7 +88,6 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(I)I", garbageValue = "-2001682063" ) - @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 51 } @@ -108,7 +97,6 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(I)V", garbageValue = "1388314285" ) - @Export("init") void init() { this.element = MidiPcmStream.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 this.label = this.region.createMapLabel(WorldMapSection0.WorldMapElement_get(this.element)); // L: 25 @@ -138,7 +126,6 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { descriptor = "(II)I", garbageValue = "-40638792" ) - @Export("getSceneXForObjectUnderMouse") public static int getSceneXForObjectUnderMouse(int var0) { return TileItem.Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var0]); } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index b9531c594e..960ea8de5b 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,34 +11,28 @@ public class WorldMapLabel { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive5") static Archive archive5; @ObfuscatedName("gx") @ObfuscatedGetter( intValue = 2023281377 ) - @Export("baseY") static int baseY; @ObfuscatedName("z") - @Export("text") String text; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 1365255333 ) - @Export("width") int width; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 2029280505 ) - @Export("height") int height; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lab;" ) - @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 87a495f308..e8469786f1 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -1,6 +1,5 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -15,28 +14,23 @@ public class WorldMapLabelSize { @ObfuscatedSignature( descriptor = "Lab;" ) - @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lab;" ) - @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lab;" ) - @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; @ObfuscatedName("bl") - @Export("otp") static String otp; @ObfuscatedName("km") @ObfuscatedSignature( descriptor = "Lbf;" ) - @Export("localPlayer") static Player localPlayer; @ObfuscatedName("t") @ObfuscatedGetter( @@ -107,7 +101,6 @@ public class WorldMapLabelSize { descriptor = "(Lkf;IB)V", garbageValue = "-8" ) - @Export("readReflectionCheck") public static void readReflectionCheck(Buffer var0, int var1) { ReflectionCheck var2 = new ReflectionCheck(); // L: 127 var2.size = var0.readUnsignedByte(); // L: 128 @@ -279,7 +272,6 @@ public class WorldMapLabelSize { descriptor = "(IZZZI)Liw;", garbageValue = "-1692884564" ) - @Export("newArchive") static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { ArchiveDisk var4 = null; // L: 1847 if (JagexCache.JagexCache_dat2File != null) { // L: 1848 @@ -294,7 +286,6 @@ public class WorldMapLabelSize { descriptor = "(IIIIIIII)V", garbageValue = "-775156313" ) - @Export("addPendingSpawnToScene") static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 6655 if (Client.isLowDetail && var0 != Huffman.Client_plane) { // L: 6656 diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index d7a23ce0d1..1b91c23235 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -3,7 +3,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -16,100 +15,81 @@ public final class WorldMapManager { @ObfuscatedSignature( descriptor = "Ldr;" ) - @Export("pcmPlayer0") static PcmPlayer pcmPlayer0; @ObfuscatedName("ft") @ObfuscatedGetter( intValue = 1798679755 ) - @Export("baseX") static int baseX; @ObfuscatedName("lz") @ObfuscatedGetter( intValue = 495693627 ) - @Export("menuHeight") static int menuHeight; @ObfuscatedName("z") - @Export("loaded") boolean loaded; @ObfuscatedName("k") - @Export("loadStarted") boolean loadStarted; @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Laj;" ) - @Export("mapAreaData") WorldMapAreaData mapAreaData; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Llp;" ) - @Export("compositeTextureSprite") Sprite compositeTextureSprite; @ObfuscatedName("i") - @Export("icons") HashMap icons; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "[[Lal;" ) - @Export("regions") WorldMapRegion[][] regions; @ObfuscatedName("x") - @Export("scaleHandlers") HashMap scaleHandlers; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "[Lls;" ) - @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("geographyArchive") final AbstractArchive geographyArchive; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("groundArchive") final AbstractArchive groundArchive; @ObfuscatedName("n") - @Export("fonts") final HashMap fonts; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -822250353 ) - @Export("tileX") int tileX; @ObfuscatedName("h") @ObfuscatedGetter( intValue = 47788579 ) - @Export("tileY") int tileY; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -1367840659 ) - @Export("tileWidth") int tileWidth; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -989936121 ) - @Export("tileHeight") int tileHeight; @ObfuscatedName("c") @ObfuscatedGetter( intValue = -1477799013 ) - @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( @@ -131,7 +111,6 @@ public final class WorldMapManager { descriptor = "(Lic;Ljava/lang/String;ZI)V", garbageValue = "1563820048" ) - @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { if (!this.loadStarted) { // L: 41 this.loaded = false; // L: 44 @@ -204,7 +183,6 @@ public final class WorldMapManager { descriptor = "(I)V", garbageValue = "-1887133174" ) - @Export("clearIcons") public final void clearIcons() { this.icons = null; // L: 105 } // L: 106 @@ -214,7 +192,6 @@ public final class WorldMapManager { descriptor = "(IIIIIIIIB)V", garbageValue = "-33" ) - @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109 int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110 @@ -261,7 +238,6 @@ public final class WorldMapManager { descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", garbageValue = "84" ) - @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143 float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144 @@ -296,7 +272,6 @@ public final class WorldMapManager { descriptor = "(IIIILjava/util/HashSet;III)V", garbageValue = "-1439979069" ) - @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { if (this.compositeTextureSprite != null) { // L: 166 this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169 @@ -365,7 +340,6 @@ public final class WorldMapManager { descriptor = "(IIIII)Lam;", garbageValue = "1560413650" ) - @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217 int var6 = this.tileX + var1; // L: 218 @@ -408,7 +382,6 @@ public final class WorldMapManager { descriptor = "(B)Z", garbageValue = "0" ) - @Export("isLoaded") public boolean isLoaded() { return this.loaded; // L: 250 } @@ -418,7 +391,6 @@ public final class WorldMapManager { descriptor = "(I)Ljava/util/HashMap;", garbageValue = "-391367086" ) - @Export("buildIcons") public HashMap buildIcons() { this.buildIcons0(); // L: 254 return this.icons; // L: 255 @@ -429,7 +401,6 @@ public final class WorldMapManager { descriptor = "(I)V", garbageValue = "2109869337" ) - @Export("buildIcons0") void buildIcons0() { if (this.icons == null) { // L: 259 this.icons = new HashMap(); // L: 260 @@ -466,7 +437,6 @@ public final class WorldMapManager { descriptor = "(III)F", garbageValue = "-1667086517" ) - @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { float var3 = (float)var1 / (float)var2; // L: 287 if (var3 > 8.0F) { // L: 288 diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 5264f17d8f..8ad6ecc978 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,31 +7,26 @@ import net.runelite.mapping.ObfuscatedSignature; @Implements("WorldMapRectangle") public final class WorldMapRectangle { @ObfuscatedName("d") - @Export("Tiles_lightness") static int[] Tiles_lightness; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 743023489 ) - @Export("width") int width; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 995076797 ) - @Export("height") int height; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1102925233 ) - @Export("x") int x; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1014669257 ) - @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( @@ -52,7 +46,6 @@ public final class WorldMapRectangle { descriptor = "(ILjava/lang/String;Ljava/lang/String;S)V", garbageValue = "128" ) - @Export("addGameMessage") static void addGameMessage(int var0, String var1, String var2) { WorldMapData_0.addChatMessage(var0, var1, var2, (String)null); // L: 19 } // L: 20 @@ -62,7 +55,6 @@ public final class WorldMapRectangle { descriptor = "(II)Lcy;", garbageValue = "-1672146154" ) - @Export("getScript") static Script getScript(int var0) { Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 25 if (var1 != null) { // L: 26 diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 42c5baf94e..15fd1ff202 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -17,7 +16,6 @@ public class WorldMapRegion { @ObfuscatedSignature( descriptor = "Lfp;" ) - @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; @ObfuscatedName("u") static String field277; @@ -25,43 +23,34 @@ public class WorldMapRegion { @ObfuscatedGetter( intValue = 1185290071 ) - @Export("regionX") int regionX; @ObfuscatedName("x") @ObfuscatedGetter( intValue = -1059284245 ) - @Export("regionY") int regionY; @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Ll;" ) - @Export("worldMapData_0") WorldMapData_0 worldMapData_0; @ObfuscatedName("g") - @Export("worldMapData1List") LinkedList worldMapData1List; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 1881987389 ) - @Export("backgroundColor") int backgroundColor; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1196076883 ) - @Export("pixelsPerTile") int pixelsPerTile; @ObfuscatedName("d") - @Export("icon0List") List icon0List; @ObfuscatedName("h") - @Export("iconMap") HashMap iconMap; @ObfuscatedName("a") - @Export("fonts") final HashMap fonts; static { @@ -103,7 +92,6 @@ public class WorldMapRegion { descriptor = "(Ll;Ljava/util/List;I)V", garbageValue = "-1730892204" ) - @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { this.iconMap.clear(); // L: 78 this.worldMapData_0 = var1; // L: 79 @@ -115,7 +103,6 @@ public class WorldMapRegion { descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", garbageValue = "1" ) - @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { this.iconMap.clear(); // L: 84 Iterator var3 = var1.iterator(); // L: 85 @@ -135,7 +122,6 @@ public class WorldMapRegion { descriptor = "(IIIILan;I)V", garbageValue = "121581751" ) - @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 97 label74: @@ -187,7 +173,6 @@ public class WorldMapRegion { descriptor = "(Ljg;IIILan;I)V", garbageValue = "329414981" ) - @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 147 Coord var7 = null; // L: 148 @@ -214,7 +199,6 @@ public class WorldMapRegion { descriptor = "(I)V", garbageValue = "1946946990" ) - @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { Iterator var1 = this.iconMap.values().iterator(); // L: 168 @@ -232,7 +216,6 @@ public class WorldMapRegion { descriptor = "(Ljava/util/List;I)V", garbageValue = "-2052830022" ) - @Export("addAllToIconList") void addAllToIconList(List var1) { Iterator var2 = var1.iterator(); @@ -270,7 +253,6 @@ public class WorldMapRegion { descriptor = "(Lic;B)Z", garbageValue = "-62" ) - @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { this.iconMap.clear(); // L: 205 if (this.worldMapData_0 != null) { // L: 206 @@ -309,7 +291,6 @@ public class WorldMapRegion { descriptor = "(ILaf;[Lls;Lic;Lic;B)V", garbageValue = "-79" ) - @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; // L: 236 if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 237 @@ -364,7 +345,6 @@ public class WorldMapRegion { descriptor = "(Ljava/util/HashSet;III)V", garbageValue = "2015143479" ) - @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { Iterator var4 = this.iconMap.values().iterator(); // L: 284 @@ -456,7 +436,6 @@ public class WorldMapRegion { descriptor = "(IILan;Laf;Lat;I)V", garbageValue = "-1873495133" ) - @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 342 int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 343 @@ -688,7 +667,6 @@ public class WorldMapRegion { descriptor = "(IILjava/util/HashSet;II)V", garbageValue = "-473063416" ) - @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; // L: 546 float var6 = var5 / 2.0F; // L: 547 @@ -737,7 +715,6 @@ public class WorldMapRegion { descriptor = "(Liv;IIIII)V", garbageValue = "-1177603152" ) - @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { Sprite var6 = var1.getSpriteBool(false); // L: 581 if (var6 != null) { // L: 582 @@ -796,7 +773,6 @@ public class WorldMapRegion { descriptor = "(IILjava/util/HashSet;II)V", garbageValue = "-1868522380" ) - @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { float var5 = (float)var4 / 64.0F; // L: 620 Iterator var6 = this.icon0List.iterator(); // L: 621 @@ -863,7 +839,6 @@ public class WorldMapRegion { descriptor = "(Liv;I)Laq;", garbageValue = "-1919467673" ) - @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 677 WorldMapLabelSize var2 = WorldMapLabelSize.method270(var1.textSize); // L: 680 @@ -939,7 +914,6 @@ public class WorldMapRegion { descriptor = "(I)Ljava/util/List;", garbageValue = "-715702618" ) - @Export("icons") List icons() { LinkedList var1 = new LinkedList(); // L: 732 var1.addAll(this.icon0List); // L: 733 @@ -977,7 +951,6 @@ public class WorldMapRegion { descriptor = "(IB)Ljm;", garbageValue = "-91" ) - @Export("SequenceDefinition_get") public static SequenceDefinition SequenceDefinition_get(int var0) { SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 if (var1 != null) { // L: 36 @@ -1018,7 +991,6 @@ public class WorldMapRegion { descriptor = "(IIIZIZI)V", garbageValue = "783564244" ) - @Export("doWorldSorting") static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { if (var0 < var1) { // L: 177 int var6 = (var0 + var1) / 2; // L: 178 diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index 8c9b907c33..7a6661cb24 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,20 @@ public class WorldMapScaleHandler { @ObfuscatedSignature( descriptor = "Lei;" ) - @Export("World_request") static UrlRequest World_request; @ObfuscatedName("h") - @Export("Tiles_hueMultiplier") static int[] Tiles_hueMultiplier; @ObfuscatedName("eb") @ObfuscatedGetter( intValue = -1388382927 ) - @Export("port3") static int port3; @ObfuscatedName("z") @ObfuscatedGetter( intValue = 1114368907 ) - @Export("pixelsPerTile") int pixelsPerTile; @ObfuscatedName("k") - @Export("tileTemplates") byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { @@ -88,7 +82,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "-1909065180" ) - @Export("init") void init() { if (this.tileTemplates == null) { // L: 34 this.tileTemplates = new byte[8][4][]; // L: 37 @@ -108,7 +101,6 @@ public class WorldMapScaleHandler { descriptor = "(B)V", garbageValue = "97" ) - @Export("init0") void init0() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 49 int var2 = 0; // L: 50 @@ -175,7 +167,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "-1716417605" ) - @Export("init1") void init1() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 int var2 = 0; // L: 89 @@ -246,7 +237,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "-1974218360" ) - @Export("init2") void init2() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 int var2 = 0; // L: 132 @@ -313,7 +303,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "922410315" ) - @Export("init3") void init3() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 int var2 = 0; // L: 171 @@ -380,7 +369,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "-1095934607" ) - @Export("init4") void init4() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 209 int var2 = 0; // L: 210 @@ -447,7 +435,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "1883920620" ) - @Export("init5") void init5() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 248 boolean var2 = false; // L: 249 @@ -516,7 +503,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "-1746576330" ) - @Export("init6") void init6() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 289 boolean var2 = false; // L: 290 @@ -585,7 +571,6 @@ public class WorldMapScaleHandler { descriptor = "(I)V", garbageValue = "1072905152" ) - @Export("init7") void init7() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 330 boolean var2 = false; // L: 331 diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index bb14240655..0785ad491f 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,7 +10,6 @@ public interface WorldMapSection { descriptor = "(Lar;B)V", garbageValue = "100" ) - @Export("expandBounds") void expandBounds(WorldMapArea var1); @ObfuscatedName("k") @@ -19,7 +17,6 @@ public interface WorldMapSection { descriptor = "(IIII)Z", garbageValue = "-339896458" ) - @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); @ObfuscatedName("s") @@ -27,7 +24,6 @@ public interface WorldMapSection { descriptor = "(III)Z", garbageValue = "-2135820245" ) - @Export("containsPosition") boolean containsPosition(int var1, int var2); @ObfuscatedName("t") @@ -35,7 +31,6 @@ public interface WorldMapSection { descriptor = "(IIII)[I", garbageValue = "-1761492451" ) - @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); @ObfuscatedName("i") @@ -43,7 +38,6 @@ public interface WorldMapSection { descriptor = "(III)Lhg;", garbageValue = "-1553504587" ) - @Export("coord") Coord coord(int var1, int var2); @ObfuscatedName("o") @@ -51,6 +45,5 @@ public interface WorldMapSection { descriptor = "(Lkf;I)V", garbageValue = "2144381737" ) - @Export("read") void read(Buffer var1); } diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 566c3ae655..21da870287 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,85 +10,71 @@ public class WorldMapSection0 implements WorldMapSection { @ObfuscatedGetter( intValue = -465345147 ) - @Export("oldZ") int oldZ; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -202719925 ) - @Export("newZ") int newZ; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 47110693 ) - @Export("oldX") int oldX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = -1315329307 ) - @Export("oldY") int oldY; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -445154313 ) - @Export("newX") int newX; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1054372917 ) - @Export("newY") int newY; @ObfuscatedName("x") @ObfuscatedGetter( intValue = 755868073 ) - @Export("oldChunkXLow") int oldChunkXLow; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -1795067773 ) - @Export("oldChunkYLow") int oldChunkYLow; @ObfuscatedName("g") @ObfuscatedGetter( intValue = -662709525 ) - @Export("oldChunkXHigh") int oldChunkXHigh; @ObfuscatedName("m") @ObfuscatedGetter( intValue = -1849440565 ) - @Export("oldChunkYHigh") int oldChunkYHigh; @ObfuscatedName("n") @ObfuscatedGetter( intValue = -1861847067 ) - @Export("newChunkXLow") int newChunkXLow; @ObfuscatedName("d") @ObfuscatedGetter( intValue = 1830088993 ) - @Export("newChunkYLow") int newChunkYLow; @ObfuscatedName("h") @ObfuscatedGetter( intValue = -878235337 ) - @Export("newChunkXHigh") int newChunkXHigh; @ObfuscatedName("a") @ObfuscatedGetter( intValue = -2049654615 ) - @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { @@ -100,7 +85,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(Lar;B)V", garbageValue = "100" ) - @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.newX) { // L: 25 var1.regionLowX = this.newX; @@ -125,7 +109,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(IIII)Z", garbageValue = "-339896458" ) - @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 32 return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35 @@ -139,7 +122,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(III)Z", garbageValue = "-2135820245" ) - @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39 } @@ -149,7 +131,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(IIII)[I", garbageValue = "-1761492451" ) - @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; // L: 44 @@ -164,7 +145,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(III)Lhg;", garbageValue = "-1553504587" ) - @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 53 return null; // L: 54 @@ -180,7 +160,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(Lkf;I)V", garbageValue = "2144381737" ) - @Export("read") public void read(Buffer var1) { this.oldZ = var1.readUnsignedByte(); // L: 62 this.newZ = var1.readUnsignedByte(); // L: 63 @@ -204,7 +183,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(B)V", garbageValue = "60" ) - @Export("postRead") void postRead() { } // L: 79 @@ -213,7 +191,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(IS)Liv;", garbageValue = "15751" ) - @Export("WorldMapElement_get") public static WorldMapElement WorldMapElement_get(int var0) { return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 42 43 } @@ -223,7 +200,6 @@ public class WorldMapSection0 implements WorldMapSection { descriptor = "(B)Lmx;", garbageValue = "122" ) - @Export("getWorldMap") static WorldMap getWorldMap() { return Message.worldMap; // L: 665 } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 82c5445019..3419d425ca 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -1,5 +1,4 @@ import java.util.Date; -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -12,49 +11,41 @@ public class WorldMapSection1 implements WorldMapSection { @ObfuscatedSignature( descriptor = "Lc;" ) - @Export("grandExchangeEvents") static GrandExchangeEvents grandExchangeEvents; @ObfuscatedName("dm") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive7") static Archive archive7; @ObfuscatedName("z") @ObfuscatedGetter( intValue = -2060258139 ) - @Export("minPlane") int minPlane; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1398963829 ) - @Export("planes") int planes; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 682976363 ) - @Export("regionStartX") int regionStartX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 38335685 ) - @Export("regionStartY") int regionStartY; @ObfuscatedName("i") @ObfuscatedGetter( intValue = 1282107961 ) - @Export("regionEndX") int regionEndX; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -167107483 ) - @Export("regionEndY") int regionEndY; WorldMapSection1() { @@ -65,7 +56,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(Lar;B)V", garbageValue = "100" ) - @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.regionEndX) { // L: 17 var1.regionLowX = this.regionEndX; @@ -90,7 +80,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(IIII)Z", garbageValue = "-339896458" ) - @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; @@ -104,7 +93,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(III)Z", garbageValue = "-2135820245" ) - @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } @@ -114,7 +102,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(IIII)[I", garbageValue = "-1761492451" ) - @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; @@ -129,7 +116,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(III)Lhg;", garbageValue = "-1553504587" ) - @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 45 return null; // L: 46 @@ -145,7 +131,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(Lkf;I)V", garbageValue = "2144381737" ) - @Export("read") public void read(Buffer var1) { this.minPlane = var1.readUnsignedByte(); // L: 54 this.planes = var1.readUnsignedByte(); // L: 55 @@ -161,7 +146,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(I)V", garbageValue = "1994421574" ) - @Export("postRead") void postRead() { } // L: 63 @@ -170,7 +154,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "(II)I", garbageValue = "1982002808" ) - @Export("getVarbit") public static int getVarbit(int var0) { VarbitDefinition var1 = TaskHandler.method3567(var0); // L: 24 int var2 = var1.baseVar; // L: 25 @@ -254,7 +237,6 @@ public class WorldMapSection1 implements WorldMapSection { descriptor = "([Lhq;IIIIIIIB)V", garbageValue = "2" ) - @Export("updateInterface") static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = 0; var8 < var0.length; ++var8) { // L: 9649 Widget var9 = var0[var8]; // L: 9650 diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 21deebf804..dcb3d92648 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,37 +10,31 @@ public class WorldMapSection2 implements WorldMapSection { @ObfuscatedGetter( intValue = -1201238509 ) - @Export("minPlane") int minPlane; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -1333374059 ) - @Export("planes") int planes; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -1475797575 ) - @Export("regionStartX") int regionStartX; @ObfuscatedName("t") @ObfuscatedGetter( intValue = 905621997 ) - @Export("regionStartY") int regionStartY; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1367224805 ) - @Export("regionEndX") int regionEndX; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -359238835 ) - @Export("regionEndY") int regionEndY; @ObfuscatedName("x") @ObfuscatedGetter( @@ -72,7 +65,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(Lar;B)V", garbageValue = "100" ) - @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.field224) { // L: 21 var1.regionLowX = this.field224; @@ -97,7 +89,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(IIII)Z", garbageValue = "-339896458" ) - @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 28 return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31 @@ -111,7 +102,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(III)Z", garbageValue = "-2135820245" ) - @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 >= this.field224 && var1 >> 6 <= this.field228 && var2 >> 6 >= this.field223 && var2 >> 6 <= this.field225; // L: 35 } @@ -121,7 +111,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(IIII)[I", garbageValue = "-1761492451" ) - @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 return null; @@ -136,7 +125,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(III)Lhg;", garbageValue = "-1553504587" ) - @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 @@ -152,7 +140,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(Lkf;I)V", garbageValue = "2144381737" ) - @Export("read") public void read(Buffer var1) { this.minPlane = var1.readUnsignedByte(); // L: 58 this.planes = var1.readUnsignedByte(); // L: 59 @@ -172,7 +159,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(I)V", garbageValue = "240000675" ) - @Export("postRead") void postRead() { } // L: 71 @@ -181,7 +167,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(IB)Lbk;", garbageValue = "1" ) - @Export("Messages_getMessage") static Message Messages_getMessage(int var0) { return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 } @@ -191,7 +176,6 @@ public class WorldMapSection2 implements WorldMapSection { descriptor = "(Ljava/lang/String;I)V", garbageValue = "835345001" ) - @Export("doCheat") static final void doCheat(String var0) { if (var0.equalsIgnoreCase("toggleroof")) { // L: 3424 Tile.clientPreferences.roofsHidden = !Tile.clientPreferences.roofsHidden; // L: 3425 diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 3cc0d2c9c9..003383ff2e 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -66,7 +65,6 @@ public class WorldMapSection3 implements WorldMapSection { descriptor = "(Lar;B)V", garbageValue = "100" ) - @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.field384) { // L: 21 var1.regionLowX = this.field384; @@ -91,7 +89,6 @@ public class WorldMapSection3 implements WorldMapSection { descriptor = "(IIII)Z", garbageValue = "-339896458" ) - @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.field391 && var1 < this.field381 + this.field391) { // L: 28 return var2 >= (this.field382 << 6) + (this.field389 << 3) && var2 <= (this.field382 << 6) + (this.field389 << 3) + 7 && var3 >= (this.field392 << 6) + (this.field387 << 3) && var3 <= (this.field392 << 6) + (this.field387 << 3) + 7; // L: 31 @@ -105,7 +102,6 @@ public class WorldMapSection3 implements WorldMapSection { descriptor = "(III)Z", garbageValue = "-2135820245" ) - @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.field384 << 6) + (this.field380 << 3) && var1 <= (this.field384 << 6) + (this.field380 << 3) + 7 && var2 >= (this.field385 << 6) + (this.field386 << 3) && var2 <= (this.field385 << 6) + (this.field386 << 3) + 7; // L: 35 } @@ -115,7 +111,6 @@ public class WorldMapSection3 implements WorldMapSection { descriptor = "(IIII)[I", garbageValue = "-1761492451" ) - @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 return null; // L: 40 @@ -130,7 +125,6 @@ public class WorldMapSection3 implements WorldMapSection { descriptor = "(III)Lhg;", garbageValue = "-1553504587" ) - @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 @@ -146,7 +140,6 @@ public class WorldMapSection3 implements WorldMapSection { descriptor = "(Lkf;I)V", garbageValue = "2144381737" ) - @Export("read") public void read(Buffer var1) { this.field391 = var1.readUnsignedByte(); // L: 58 this.field381 = var1.readUnsignedByte(); // L: 59 diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index f3e0a82004..b8d1c9a36d 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -11,25 +10,21 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedSignature( descriptor = "Lae;" ) - @Export("WORLDMAPSECTIONTYPE0") WORLDMAPSECTIONTYPE0(2, (byte)0), @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lae;" ) - @Export("WORLDMAPSECTIONTYPE1") WORLDMAPSECTIONTYPE1(1, (byte)1), @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lae;" ) - @Export("WORLDMAPSECTIONTYPE2") WORLDMAPSECTIONTYPE2(3, (byte)2), @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lae;" ) - @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(0, (byte)3); @ObfuscatedName("g") @@ -41,10 +36,8 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedGetter( intValue = 750880259 ) - @Export("type") final int type; @ObfuscatedName("o") - @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { @@ -57,7 +50,6 @@ public enum WorldMapSectionType implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 26 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 3b974219fc..1838a48b5b 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,10 +11,8 @@ public final class WorldMapSprite { @ObfuscatedSignature( descriptor = "Llw;" ) - @Export("rasterProvider") public static AbstractRasterProvider rasterProvider; @ObfuscatedName("k") - @Export("tileColors") final int[] tileColors; WorldMapSprite() { @@ -31,7 +28,6 @@ public final class WorldMapSprite { descriptor = "(III)I", garbageValue = "1945716520" ) - @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var2 * 64 + var1]; // L: 24 } @@ -76,7 +72,6 @@ public final class WorldMapSprite { descriptor = "(IS)Z", garbageValue = "20454" ) - @Export("loadInterface") public static boolean loadInterface(int var0) { if (Bounds.Widget_loadedInterfaces[var0]) { // L: 203 return true; diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 1eb17a84fc..069b754c74 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @@ -6,7 +5,6 @@ import net.runelite.mapping.ObfuscatedName; @Implements("Wrapper") public abstract class Wrapper extends DualNode { @ObfuscatedName("k") - @Export("size") final int size; Wrapper(int var1) { @@ -14,10 +12,8 @@ public abstract class Wrapper extends DualNode { } // L: 10 @ObfuscatedName("z") - @Export("get") abstract Object get(); @ObfuscatedName("k") - @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 535ec07cfa..0921a716b4 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @@ -9,13 +8,11 @@ final class class1 implements class0 { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Ldy;" ) - @Export("soundSystem") static SoundSystem soundSystem; @ObfuscatedName("z") @@ -108,7 +105,6 @@ final class class1 implements class0 { descriptor = "(CI)Z", garbageValue = "2143002774" ) - @Export("isDigit") public static boolean isDigit(char var0) { return var0 >= '0' && var0 <= '9'; // L: 146 } @@ -118,7 +114,6 @@ final class class1 implements class0 { descriptor = "(Lhq;III)V", garbageValue = "362928511" ) - @Export("Widget_addToMenu") static final void Widget_addToMenu(Widget var0, int var1, int var2) { if (var0.buttonType == 1) { // L: 9454 StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 9455 diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index f200fbf20a..4538d8f456 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,13 +8,11 @@ public class class105 { @ObfuscatedSignature( descriptor = "Ljv;" ) - @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; @ObfuscatedName("ix") @ObfuscatedGetter( intValue = 1183836299 ) - @Export("selectedItemWidget") static int selectedItemWidget; static { diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index b252192315..6183871204 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -2,7 +2,6 @@ import java.io.InputStream; import java.io.OutputStreamWriter; import java.net.URL; import java.net.URLConnection; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -58,7 +57,6 @@ public final class class13 { descriptor = "(III)V", garbageValue = "347660061" ) - @Export("updateItemPile") static final void updateItemPile(int var0, int var1) { NodeDeque var2 = Client.groundItems[Huffman.Client_plane][var0][var1]; // L: 6697 if (var2 == null) { // L: 6698 @@ -111,7 +109,6 @@ public final class class13 { descriptor = "(Lhq;IIB)V", garbageValue = "-96" ) - @Export("clickWidget") static final void clickWidget(Widget var0, int var1, int var2) { if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10145 if (var0 != null) { // L: 10147 diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index 934c4a2f05..49b8a4d115 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -36,7 +35,6 @@ public enum class169 implements Enumerated { @ObfuscatedGetter( intValue = 1306076667 ) - @Export("id") final int id; class169(int var3, int var4) { @@ -49,7 +47,6 @@ public enum class169 implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 21 } diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java index 626d7dfa0a..6ea2805e12 100644 --- a/runescape-client/src/main/java/class182.java +++ b/runescape-client/src/main/java/class182.java @@ -1,5 +1,4 @@ import java.awt.Component; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,10 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gx") public class class182 { @ObfuscatedName("s") - @Export("directions") static int[][] directions; @ObfuscatedName("t") - @Export("distances") static int[][] distances; @ObfuscatedName("i") @ObfuscatedGetter( @@ -23,16 +20,13 @@ public class class182 { ) static int field2136; @ObfuscatedName("w") - @Export("bufferX") static int[] bufferX; @ObfuscatedName("g") - @Export("bufferY") static int[] bufferY; @ObfuscatedName("dw") @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive0") static Archive archive0; static { diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index d2fbf83c66..250426df25 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -80,7 +79,6 @@ public class class194 { descriptor = "(IS)Ljava/lang/String;", garbageValue = "4096" ) - @Export("inventoryQuantityFormat") static final String inventoryQuantityFormat(int var0) { if (var0 < 100000) { // L: 421 return "" + var0 + ""; diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index 2cb373cd8b..f364bcd7ea 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -7,7 +7,6 @@ import java.io.StreamCorruptedException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.Reflection; @@ -19,7 +18,6 @@ public class class195 { descriptor = "(II)Lik;", garbageValue = "-26050751" ) - @Export("VarpDefinition_get") public static VarpDefinition VarpDefinition_get(int var0) { VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23 if (var1 != null) { // L: 24 @@ -41,7 +39,6 @@ public class class195 { descriptor = "(Lky;I)V", garbageValue = "1634836666" ) - @Export("performReflectionCheck") public static void performReflectionCheck(PacketBuffer var0) { ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 29 if (var1 != null) { // L: 30 diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index a94e9426ed..0dcf1a64fa 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.Reflection; @@ -104,7 +103,6 @@ public class class197 { descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", garbageValue = "432871093" ) - @Export("loadClassFromDescriptor") static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { if (var0.equals("B")) { // L: 216 return Byte.TYPE; diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index 5afb310de4..5200633a02 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,6 @@ public class class198 { descriptor = "(I)[Lga;", garbageValue = "900094506" ) - @Export("ServerPacket_values") public static ServerPacket[] ServerPacket_values() { return new ServerPacket[]{ServerPacket.field2164, ServerPacket.field2185, ServerPacket.field2200, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2243, ServerPacket.field2163, ServerPacket.field2178, ServerPacket.field2189, ServerPacket.field2244, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2242, ServerPacket.field2173, ServerPacket.field2215, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2159, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2219, ServerPacket.field2182, ServerPacket.field2197, ServerPacket.field2190, ServerPacket.field2166, ServerPacket.field2186, ServerPacket.field2187, ServerPacket.field2217, ServerPacket.field2195, ServerPacket.field2158, ServerPacket.field2191, ServerPacket.field2196, ServerPacket.field2193, ServerPacket.field2194, ServerPacket.field2214, ServerPacket.field2165, ServerPacket.field2204, ServerPacket.field2213, ServerPacket.field2199, ServerPacket.field2224, ServerPacket.field2201, ServerPacket.field2202, ServerPacket.field2203, ServerPacket.field2239, ServerPacket.field2205, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2211, ServerPacket.field2212, ServerPacket.field2229, ServerPacket.field2174, ServerPacket.field2222, ServerPacket.field2162, ServerPacket.field2172, ServerPacket.field2218, ServerPacket.field2227, ServerPacket.field2220, ServerPacket.field2221, ServerPacket.field2181, ServerPacket.field2223, ServerPacket.field2232, ServerPacket.field2225, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2228, ServerPacket.field2234, ServerPacket.field2230, ServerPacket.field2231, ServerPacket.field2226, ServerPacket.field2233, ServerPacket.field2216, ServerPacket.field2235, ServerPacket.field2236, ServerPacket.field2237, ServerPacket.field2238, ServerPacket.field2188, ServerPacket.field2240, ServerPacket.field2241, ServerPacket.field2192}; // L: 95 } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 7e5b866342..6d13705860 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,13 +1,11 @@ import java.io.File; import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("s") final class class2 implements class0 { @ObfuscatedName("ak") - @Export("client") @ObfuscatedSignature( descriptor = "Lclient;" ) @@ -54,7 +52,6 @@ final class class2 implements class0 { descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", garbageValue = "-65308195" ) - @Export("getPreferencesFile") public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 254 if (var3.exists()) { // L: 255 @@ -95,7 +92,6 @@ final class class2 implements class0 { descriptor = "(Lky;IB)V", garbageValue = "0" ) - @Export("updatePlayers") static final void updatePlayers(PacketBuffer var0, int var1) { int var2 = var0.offset; // L: 71 Players.Players_pendingUpdateCount = 0; // L: 72 @@ -248,7 +244,6 @@ final class class2 implements class0 { descriptor = "(Lct;Lct;IZI)I", garbageValue = "-1471350049" ) - @Export("compareWorlds") static int compareWorlds(World var0, World var1, int var2, boolean var3) { if (var2 == 1) { // L: 211 int var4 = var0.population; // L: 212 diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index c8d4a52763..53f700fe5d 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -1,5 +1,4 @@ import java.util.HashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class class204 { @ObfuscatedGetter( intValue = 326799997 ) - @Export("foundItemIdCount") static int foundItemIdCount; @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("musicTrackArchive") public static AbstractArchive musicTrackArchive; @ObfuscatedName("q") static int[][][] field2421; @@ -51,7 +48,6 @@ public class class204 { descriptor = "(IIIB)Lcy;", garbageValue = "-39" ) - @Export("getWorldMapScript") static Script getWorldMapScript(int var0, int var1, int var2) { int var3 = class13.method129(var1, var0); // L: 37 Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 40 @@ -127,7 +123,6 @@ public class class204 { descriptor = "(CI)Z", garbageValue = "-2091339129" ) - @Export("isAlphaNumeric") public static boolean isAlphaNumeric(char var0) { return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 150 } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 3929515018..324610b86f 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,40 +8,33 @@ public class class206 { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("musicPatchesArchive") static AbstractArchive musicPatchesArchive; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("musicSamplesArchive") static AbstractArchive musicSamplesArchive; @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lge;" ) - @Export("midiPcmStream") public static MidiPcmStream midiPcmStream; @ObfuscatedName("i") @ObfuscatedGetter( intValue = -1660292459 ) - @Export("musicPlayerStatus") public static int musicPlayerStatus; @ObfuscatedName("w") @ObfuscatedGetter( intValue = 1418179019 ) - @Export("musicTrackFileId") public static int musicTrackFileId; @ObfuscatedName("n") - @Export("musicTrackBoolean") public static boolean musicTrackBoolean; @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "Lhj;" ) - @Export("musicTrack") static MusicTrack musicTrack; static { diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index ce91039588..51620c1e04 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -14,7 +13,6 @@ public class class219 { @ObfuscatedSignature( descriptor = "Lht;" ) - @Export("huffman") public static Huffman huffman; @ObfuscatedName("z") @@ -22,7 +20,6 @@ public class class219 { descriptor = "(II)Z", garbageValue = "-1168903600" ) - @Export("isWorldMapEvent") public static boolean isWorldMapEvent(int var0) { return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index e8f27ae7c2..32833cd35b 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -1,5 +1,4 @@ import java.util.LinkedHashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -50,7 +49,6 @@ public class class22 { descriptor = "(S)V", garbageValue = "31538" ) - @Export("Widget_runOnTargetLeave") static void Widget_runOnTargetLeave() { if (Client.isSpellSelected) { // L: 8116 Widget var0 = SecureRandomCallable.getWidgetChild(class232.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8117 diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java index b3d2801879..fe3b383669 100644 --- a/runescape-client/src/main/java/class224.java +++ b/runescape-client/src/main/java/class224.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -16,7 +15,6 @@ public class class224 { @ObfuscatedSignature( descriptor = "Lkf;" ) - @Export("NetCache_responseArchiveBuffer") static Buffer NetCache_responseArchiveBuffer; static { diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index 3b2bde4290..6e9bf39483 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -25,7 +24,6 @@ public class class225 { descriptor = "(Lky;II)V", garbageValue = "2025973106" ) - @Export("readPlayerUpdate") static void readPlayerUpdate(PacketBuffer var0, int var1) { boolean var2 = var0.readBits(1) == 1; // L: 189 if (var2) { // L: 190 diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 524b8af21c..33eb66604d 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,13 +8,11 @@ public class class227 { @ObfuscatedGetter( intValue = 775643589 ) - @Export("ItemDefinition_fileCount") public static int ItemDefinition_fileCount; @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("options_buttons_0Sprite") static IndexedSprite options_buttons_0Sprite; @ObfuscatedName("z") @@ -23,7 +20,6 @@ public class class227 { descriptor = "(CI)B", garbageValue = "-636086719" ) - @Export("charToByteCp1252") public static byte charToByteCp1252(char var0) { byte var1; if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 @@ -90,7 +86,6 @@ public class class227 { } @ObfuscatedName("z") - @Export("sleepExact") public static final void sleepExact(long var0) { if (var0 > 0L) { // L: 9 if (0L == var0 % 10L) { // L: 10 @@ -130,7 +125,6 @@ public class class227 { descriptor = "(IIIZII)J", garbageValue = "-1245700740" ) - @Export("calculateTag") public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 80 if (var3) { // L: 81 diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index 2abc03f36d..e68c849144 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,6 +7,5 @@ public class class23 { @ObfuscatedGetter( intValue = 121218585 ) - @Export("port2") static int port2; } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index 92a7152b26..703ea7af61 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,6 @@ public class class231 { @ObfuscatedSignature( descriptor = "Lic;" ) - @Export("ItemDefinition_archive") static AbstractArchive ItemDefinition_archive; @ObfuscatedName("ft") @@ -16,7 +14,6 @@ public class class231 { descriptor = "(IIIIZI)V", garbageValue = "1537075351" ) - @Export("setViewportShape") static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { if (var2 < 1) { // L: 4175 var2 = 1; diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 2fd7075582..98b3513597 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,6 +7,5 @@ public class class232 { @ObfuscatedGetter( intValue = -149215753 ) - @Export("selectedSpellWidget") static int selectedSpellWidget; } diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 3dc77959b5..781271d46f 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -16,7 +15,6 @@ public class class234 { descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;I)Lls;", garbageValue = "246084812" ) - @Export("SpriteBuffer_getIndexedSpriteByName") public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { int var3 = var0.getGroupId(var1); // L: 142 int var4 = var0.getFileId(var3, var2); // L: 143 diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java index 65da53fafd..49740914a4 100644 --- a/runescape-client/src/main/java/class235.java +++ b/runescape-client/src/main/java/class235.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,6 @@ public class class235 { @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("mapDotSprites") static Sprite[] mapDotSprites; @ObfuscatedName("ad") @@ -16,7 +14,6 @@ public class class235 { descriptor = "(IB)V", garbageValue = "1" ) - @Export("runWidgetOnLoadListener") static void runWidgetOnLoadListener(int var0) { if (var0 != -1) { // L: 3836 if (WorldMapSprite.loadInterface(var0)) { // L: 3837 diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index 7c7f33a15c..9f36539318 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -1,5 +1,4 @@ import java.util.HashMap; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -7,13 +6,11 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("id") public class class247 { @ObfuscatedName("z") - @Export("spriteMap") final HashMap spriteMap; @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Llr;" ) - @Export("bounds") Bounds bounds; @ObfuscatedName("s") int[] field3214; @@ -204,7 +201,6 @@ public class class247 { descriptor = "(Lhq;Ljq;IIZB)V", garbageValue = "0" ) - @Export("addWidgetItemMenuItem") static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { String[] var5 = var1.inventoryActions; // L: 9431 byte var6 = -1; // L: 9432 diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 5c455475e1..a058c2c8be 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -9,7 +8,6 @@ public class class25 { descriptor = "(I)[Llm;", garbageValue = "742415234" ) - @Export("FillMode_values") public static FillMode[] FillMode_values() { return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENT_ALPHA}; // L: 15 } @@ -18,7 +16,6 @@ public class class25 { @ObfuscatedSignature( descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lme;" ) - @Export("newRunException") public static RunException newRunException(Throwable var0, String var1) { RunException var2; if (var0 instanceof RunException) { // L: 99 diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java index d06a7c175e..cbf67da038 100644 --- a/runescape-client/src/main/java/class278.java +++ b/runescape-client/src/main/java/class278.java @@ -1,10 +1,8 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("ja") public class class278 { @ObfuscatedName("ae") - @Export("fontHelvetica13") static java.awt.Font fontHelvetica13; @ObfuscatedName("z") diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index 43c1ecd493..6d41adb2b5 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,6 @@ public class class279 { @ObfuscatedSignature( descriptor = "[Llp;" ) - @Export("headIconPkSprites") static Sprite[] headIconPkSprites; @ObfuscatedName("r") diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index e2399eb287..14f78e6a0b 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @@ -10,7 +9,6 @@ public class class280 { descriptor = "(Lby;II)V", garbageValue = "1050583706" ) - @Export("runScript") static void runScript(ScriptEvent var0, int var1) { Object[] var2 = var0.args; // L: 101 Script var3; @@ -327,7 +325,6 @@ public class class280 { descriptor = "(Ljava/lang/String;ZZI)V", garbageValue = "-1343804215" ) - @Export("openURL") public static void openURL(String var0, boolean var1, boolean var2) { WorldMapData_0.method255(var0, var1, "openjs", var2); // L: 27 } // L: 28 diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index 975d7d0364..8ca4b1d100 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,6 +7,5 @@ public class class296 { @ObfuscatedSignature( descriptor = "Lls;" ) - @Export("titleboxSprite") static IndexedSprite titleboxSprite; } diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java index eb4e956a20..5017cd6eb0 100644 --- a/runescape-client/src/main/java/class297.java +++ b/runescape-client/src/main/java/class297.java @@ -1,11 +1,9 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kt") public class class297 { @ObfuscatedName("z") - @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; @ObfuscatedName("o") static byte[][][] field3668; @@ -34,7 +32,6 @@ public class class297 { descriptor = "(IB)Ljava/lang/String;", garbageValue = "115" ) - @Export("formatItemStacks") static final String formatItemStacks(int var0) { String var1 = Integer.toString(var0); // L: 9175 diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java index 215a6845d8..541f37d1e6 100644 --- a/runescape-client/src/main/java/class298.java +++ b/runescape-client/src/main/java/class298.java @@ -1,11 +1,9 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ks") public final class class298 { @ObfuscatedName("z") - @Export("base37Table") static final char[] base37Table; @ObfuscatedName("k") static long[] field3673; @@ -64,7 +62,6 @@ public final class class298 { descriptor = "(II)[B", garbageValue = "1967636466" ) - @Export("ByteArrayPool_getArray") public static synchronized byte[] ByteArrayPool_getArray(int var0) { return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 } @@ -74,7 +71,6 @@ public final class class298 { descriptor = "(IIB)V", garbageValue = "108" ) - @Export("playSoundJingle") static void playSoundJingle(int var0, int var1) { if (Client.musicVolume != 0 && var0 != -1) { // L: 3312 Script.method2322(GrandExchangeEvent.archive11, var0, 0, Client.musicVolume, false); // L: 3313 diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 851da7d8e5..376dace1e2 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -10,7 +10,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.util.Random; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -46,7 +45,6 @@ public class class3 implements Enumerated { @ObfuscatedSignature( descriptor = "Liw;" ) - @Export("archive17") static Archive archive17; @ObfuscatedName("t") @ObfuscatedGetter( @@ -87,7 +85,6 @@ public class class3 implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.field16; // L: 94 } @@ -149,7 +146,6 @@ public class class3 implements Enumerated { descriptor = "(Lbw;I)V", garbageValue = "823083332" ) - @Export("doCycleTitle") static void doCycleTitle(GameShell var0) { if (Login.worldSelectOpen) { // L: 264 GameBuild.method4217(var0); // L: 265 @@ -1064,7 +1060,6 @@ public class class3 implements Enumerated { descriptor = "(I)V", garbageValue = "1948911757" ) - @Export("load") static void load() { int var27; if (Client.titleLoadingStage == 0) { // L: 1446 diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index d329a5a05f..b4bc042be5 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,6 +7,5 @@ public final class class300 { @ObfuscatedSignature( descriptor = "Ldd;" ) - @Export("pcmPlayerProvider") public static PlayerProvider pcmPlayerProvider; } diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java index 38b3976f60..9b9396cfae 100644 --- a/runescape-client/src/main/java/class310.java +++ b/runescape-client/src/main/java/class310.java @@ -1,10 +1,8 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("kn") public class class310 { @ObfuscatedName("z") - @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { // L: 12 if (var3 == var1) { // L: 13 @@ -52,7 +50,6 @@ public class class310 { } // L: 49 @ObfuscatedName("m") - @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 var0[var1++] = 0; // L: 366 diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index 7e036aca13..4d776d488d 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -57,7 +56,6 @@ public enum class322 implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.field3844; // L: 23 } diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java index 0c4f9f5889..3e7690af96 100644 --- a/runescape-client/src/main/java/class335.java +++ b/runescape-client/src/main/java/class335.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @@ -8,27 +7,21 @@ public class class335 { @ObfuscatedGetter( intValue = -245984031 ) - @Export("SpriteBuffer_spriteCount") static int SpriteBuffer_spriteCount; @ObfuscatedName("k") @ObfuscatedGetter( intValue = -112832063 ) - @Export("SpriteBuffer_spriteWidth") static int SpriteBuffer_spriteWidth; @ObfuscatedName("s") @ObfuscatedGetter( intValue = 707136589 ) - @Export("SpriteBuffer_spriteHeight") static int SpriteBuffer_spriteHeight; @ObfuscatedName("i") - @Export("SpriteBuffer_yOffsets") static int[] SpriteBuffer_yOffsets; @ObfuscatedName("o") - @Export("SpriteBuffer_spriteWidths") static int[] SpriteBuffer_spriteWidths; @ObfuscatedName("x") - @Export("SpriteBuffer_spriteHeights") static int[] SpriteBuffer_spriteHeights; } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index e8f4ab7782..9fe51bc286 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -21,13 +20,11 @@ public class class39 { @ObfuscatedSignature( descriptor = "Lds;" ) - @Export("soundCache") static SoundCache soundCache; @ObfuscatedName("s") @ObfuscatedGetter( intValue = -812273923 ) - @Export("value") final int value; static { @@ -53,7 +50,6 @@ public class class39 { descriptor = "(IB)Z", garbageValue = "91" ) - @Export("Widget_hasContinueOption") public static boolean Widget_hasContinueOption(int var0) { return (var0 & 1) != 0; // L: 9 } @@ -63,7 +59,6 @@ public class class39 { descriptor = "(I)I", garbageValue = "488436516" ) - @Export("getWindowedMode") static int getWindowedMode() { return Client.isResizable ? 2 : 1; // L: 3862 } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 958a1698dd..7a295c2804 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,6 @@ final class class4 implements class0 { @ObfuscatedSignature( descriptor = "Lkr;" ) - @Export("fontBold12") static Font fontBold12; @ObfuscatedName("z") @@ -52,7 +50,6 @@ final class class4 implements class0 { descriptor = "([Lhq;Lhq;ZB)V", garbageValue = "73" ) - @Export("revalidateWidgetScroll") static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1105005447 * -1556531767 : var1.width * 1613274363 * 1200164403; // L: 9211 int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1626628049 * 298473777 : var1.height * 1137118319 * 1991496335; // L: 9212 diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java index a4137af3b9..a80e8263bf 100644 --- a/runescape-client/src/main/java/class41.java +++ b/runescape-client/src/main/java/class41.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,7 +7,6 @@ public class class41 { @ObfuscatedSignature( descriptor = "Ldt;" ) - @Export("textureProvider") static TextureProvider textureProvider; @ObfuscatedName("z") @@ -141,7 +139,6 @@ public class class41 { descriptor = "(ZI)V", garbageValue = "-1795227808" ) - @Export("Login_promptCredentials") static void Login_promptCredentials(boolean var0) { Login.Login_response1 = ""; // L: 1088 Login.Login_response2 = "Enter your username/email & password."; // L: 1089 diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java index dd64858936..f557d27d25 100644 --- a/runescape-client/src/main/java/class52.java +++ b/runescape-client/src/main/java/class52.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -16,7 +15,6 @@ public final class class52 { descriptor = "(Lhq;I)V", garbageValue = "2097597667" ) - @Export("invalidateWidget") static void invalidateWidget(Widget var0) { if (var0.cycle == Client.field881) { // L: 10259 Client.field882[var0.rootIndex] = true; // L: 10260 diff --git a/runescape-client/src/main/java/class58.java b/runescape-client/src/main/java/class58.java index ffd11c1b95..13dfd984e3 100644 --- a/runescape-client/src/main/java/class58.java +++ b/runescape-client/src/main/java/class58.java @@ -1,5 +1,4 @@ import javax.imageio.ImageIO; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,13 +9,11 @@ public class class58 { @ObfuscatedGetter( intValue = -1766812037 ) - @Export("gameCyclesToDo") static int gameCyclesToDo; @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "Lgn;" ) - @Export("clientLanguage") static Language clientLanguage; static { @@ -120,7 +117,6 @@ public class class58 { descriptor = "(CLgn;I)I", garbageValue = "65536" ) - @Export("lowercaseChar") static int lowercaseChar(char var0, Language var1) { int var2 = var0 << 4; // L: 128 if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 129 @@ -140,7 +136,6 @@ public class class58 { descriptor = "(IB)V", garbageValue = "50" ) - @Export("getLoginError") static void getLoginError(int var0) { if (var0 == -3) { // L: 2419 UrlRequester.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); @@ -248,7 +243,6 @@ public class class58 { descriptor = "(Lbq;ZI)V", garbageValue = "-1212325817" ) - @Export("closeInterface") static final void closeInterface(InterfaceParent var0, boolean var1) { int var2 = var0.group; // L: 10505 int var3 = (int)var0.key; // L: 10506 diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 927cd02b4c..367ada753a 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,5 +1,4 @@ import java.applet.Applet; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,17 +9,14 @@ public class class60 { @ObfuscatedSignature( descriptor = "Lcr;" ) - @Export("friendSystem") public static FriendSystem friendSystem; @ObfuscatedName("z") - @Export("applet") static Applet applet; @ObfuscatedName("k") static String field451; @ObfuscatedName("a") static int[] field453; @ObfuscatedName("ah") - @Export("null_string") protected static String null_string; @ObfuscatedName("ef") @ObfuscatedGetter( @@ -38,7 +34,6 @@ public class class60 { descriptor = "(B)Z", garbageValue = "-14" ) - @Export("isKeyDown") public static final boolean isKeyDown() { synchronized(KeyHandler.KeyHandler_instance) { // L: 164 if (KeyHandler.field423 == KeyHandler.field399) { // L: 165 @@ -78,7 +73,6 @@ public class class60 { descriptor = "(Lhq;IS)V", garbageValue = "15262" ) - @Export("Widget_setKeyIgnoreHeld") static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { if (var0.field2626 == null) { // L: 934 throw new RuntimeException(); // L: 935 @@ -96,7 +90,6 @@ public class class60 { descriptor = "(IIII)I", garbageValue = "877979774" ) - @Export("hslToRgb") static final int hslToRgb(int var0, int var1, int var2) { if (var2 > 179) { // L: 884 var1 /= 2; diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index e0771b1a93..ac035d9ead 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,7 +11,6 @@ public class class69 { descriptor = "([Ljava/lang/String;[SIII)V", garbageValue = "928633152" ) - @Export("sortItemsByName") public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { if (var2 < var3) { // L: 9 int var4 = (var3 + var2) / 2; // L: 10 @@ -50,7 +48,6 @@ public class class69 { descriptor = "(Lhq;IIII)V", garbageValue = "1412729632" ) - @Export("drawCompass") static final void drawCompass(Widget var0, int var1, int var2, int var3) { SpriteMask var4 = var0.getSpriteMask(false); // L: 10637 if (var4 != null) { // L: 10638 diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 9fca19415e..a1e2df3b64 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,4 +1,3 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -44,7 +43,6 @@ public enum class7 implements Enumerated { descriptor = "(I)I", garbageValue = "385513888" ) - @Export("rsOrdinal") public int rsOrdinal() { return this.field38; // L: 17 } @@ -68,7 +66,6 @@ public enum class7 implements Enumerated { descriptor = "(IIII)V", garbageValue = "-2096801183" ) - @Export("queueSoundEffect") static void queueSoundEffect(int var0, int var1, int var2) { if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3277 Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3278 diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 84ee85e417..488b1907ac 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,5 +1,4 @@ import java.util.concurrent.Callable; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -12,7 +11,6 @@ public class class8 implements Callable { ) static int field43; @ObfuscatedName("pv") - @Export("ClanChat_inClanChat") static boolean ClanChat_inClanChat; @ObfuscatedName("z") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java index cf13977f72..a22242f092 100644 --- a/runescape-client/src/main/java/class89.java +++ b/runescape-client/src/main/java/class89.java @@ -1,6 +1,5 @@ import java.math.BigInteger; import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -46,7 +45,6 @@ public class class89 { descriptor = "(II)V", garbageValue = "602324309" ) - @Export("forceDisconnect") static final void forceDisconnect(int var0) { ViewportMouse.logOut(); // L: 2510 switch(var0) { // L: 2511 @@ -65,7 +63,6 @@ public class class89 { descriptor = "(IIIB)V", garbageValue = "-29" ) - @Export("worldToScreen") static final void worldToScreen(int var0, int var1, int var2) { if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4945 int var3 = ArchiveLoader.getTileHeight(var0, var1, Huffman.Client_plane) - var2; // L: 4950 diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index bdf4981093..50407aaea2 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -1,7 +1,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -11,7 +10,6 @@ public class class9 { @ObfuscatedSignature( descriptor = "Ldf;" ) - @Export("decimator") static Decimator decimator; @ObfuscatedName("z") ExecutorService field52; @@ -217,7 +215,6 @@ public class class9 { descriptor = "(IIIIIIIIII)V", garbageValue = "-1834411387" ) - @Export("updatePendingSpawn") static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { PendingSpawn var9 = null; // L: 6609 diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java index f849880377..f3066f558e 100644 --- a/runescape-client/src/main/java/class90.java +++ b/runescape-client/src/main/java/class90.java @@ -1,14 +1,12 @@ import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cc") public class class90 { @ObfuscatedName("gh") - @Export("regions") static int[] regions; @ObfuscatedName("z") diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 9f14d13148..85aa7b6526 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -1,5 +1,4 @@ import java.math.BigInteger; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,7 +9,6 @@ public class class92 { @ObfuscatedName("k") static final BigInteger field1187; @ObfuscatedName("g") - @Export("SpriteBuffer_pixels") static byte[][] SpriteBuffer_pixels; static { diff --git a/runescape-client/src/main/java/net/runelite/rs/Util.java b/runescape-client/src/main/java/net/runelite/rs/Util.java new file mode 100644 index 0000000000..67cd30855b --- /dev/null +++ b/runescape-client/src/main/java/net/runelite/rs/Util.java @@ -0,0 +1,63 @@ +package net.runelite.rs; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Scanner; + +public class Util { + + public static void main(String[] args) + { + Scanner inFile1 = null; + try { + int count = 0; + for (File f : Objects.requireNonNull(new File("./runescape-client/src/main/java/").listFiles())) + { + if (f.isDirectory()) + continue; + + inFile1 = new Scanner(f); + List tokens = new ArrayList<>(); + while (inFile1.hasNext()) { + tokens.add(inFile1.nextLine()); + } + String[] fileLines = tokens.toArray(new String[0]); + ArrayList newFileLines = new ArrayList<>(); + for (String line : fileLines) + { + if (line.contains("import net.runelite.mapping.Export;")) + continue; + + if (line.contains("@Export")) + { + count++; + continue; + } + + newFileLines.add(line); + } + write(f.getAbsolutePath(), newFileLines.toArray(new String[0])); + } + System.out.println(count + " exports removed."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void write (String filename, String[] lines) throws IOException { + BufferedWriter outputWriter; + outputWriter = new BufferedWriter(new FileWriter(filename)); + for (String line : lines) + { + outputWriter.write(line); + outputWriter.newLine(); + } + outputWriter.flush(); + outputWriter.close(); + } +}