rs-client: remove Export annotations

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

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

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

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

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

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() {

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

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

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("");

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) {

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

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 {

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
 	}

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

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 {

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

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 {

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

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
 	}

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

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
 

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(

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() {

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

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
 	}

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

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

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

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

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

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) {

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) {

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

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;

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

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;

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
 	}

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

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

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

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
 

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

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

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

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 {

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

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

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

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

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;

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
 	}

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

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

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

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

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
 	}

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();
 }

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

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() {

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;

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
 	}

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

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

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

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

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

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

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

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
 	}

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(

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

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

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

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 {

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

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
 	}

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

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

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

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
 	}

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

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

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
 	}

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
 	}

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
 	}

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

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;

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

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;

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

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;

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

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;

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

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
 	}

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
 

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

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

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) {