From ae98acf18aab030f819f76e3942ead5c9d6808a4 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 22 Nov 2015 20:49:47 -0600
Subject: [PATCH] Add Exports and Implements from runeloader. Some fields are
 exported twice with two different names and I don't know what to do there

---
 .../java/net/runelite/rs/client/class0.java   |  2 ++
 .../java/net/runelite/rs/client/class100.java |  8 +++++
 .../java/net/runelite/rs/client/class104.java |  2 ++
 .../java/net/runelite/rs/client/class107.java |  4 +++
 .../java/net/runelite/rs/client/class11.java  |  2 ++
 .../java/net/runelite/rs/client/class118.java |  5 +++
 .../java/net/runelite/rs/client/class132.java |  2 ++
 .../java/net/runelite/rs/client/class143.java |  4 +++
 .../java/net/runelite/rs/client/class15.java  |  6 ++++
 .../java/net/runelite/rs/client/class161.java |  2 ++
 .../java/net/runelite/rs/client/class17.java  |  6 ++++
 .../java/net/runelite/rs/client/class172.java | 36 +++++++++++++++++++
 .../java/net/runelite/rs/client/class175.java |  3 ++
 .../java/net/runelite/rs/client/class19.java  |  4 +++
 .../java/net/runelite/rs/client/class195.java |  2 ++
 .../java/net/runelite/rs/client/class198.java |  5 +++
 .../java/net/runelite/rs/client/class2.java   |  9 +++++
 .../java/net/runelite/rs/client/class203.java |  5 +++
 .../java/net/runelite/rs/client/class207.java |  6 ++++
 .../java/net/runelite/rs/client/class209.java |  6 ++++
 .../java/net/runelite/rs/client/class219.java |  9 +++++
 .../java/net/runelite/rs/client/class226.java |  6 ++++
 .../java/net/runelite/rs/client/class24.java  |  7 ++++
 .../java/net/runelite/rs/client/class25.java  |  8 +++++
 .../java/net/runelite/rs/client/class28.java  |  5 +++
 .../java/net/runelite/rs/client/class29.java  |  2 ++
 .../java/net/runelite/rs/client/class3.java   |  4 +++
 .../java/net/runelite/rs/client/class31.java  |  2 ++
 .../java/net/runelite/rs/client/class34.java  |  4 +++
 .../java/net/runelite/rs/client/class35.java  |  6 ++++
 .../java/net/runelite/rs/client/class37.java  | 13 +++++++
 .../java/net/runelite/rs/client/class39.java  | 11 ++++++
 .../java/net/runelite/rs/client/class40.java  |  5 +++
 .../java/net/runelite/rs/client/class42.java  |  8 +++++
 .../java/net/runelite/rs/client/class47.java  |  2 ++
 .../java/net/runelite/rs/client/class5.java   |  3 ++
 .../java/net/runelite/rs/client/class51.java  |  5 +++
 .../java/net/runelite/rs/client/class6.java   |  9 +++++
 .../java/net/runelite/rs/client/class7.java   |  5 +++
 .../java/net/runelite/rs/client/class76.java  |  2 ++
 .../java/net/runelite/rs/client/class78.java  |  2 ++
 .../java/net/runelite/rs/client/class8.java   |  2 ++
 .../java/net/runelite/rs/client/class83.java  |  2 ++
 .../java/net/runelite/rs/client/class84.java  |  4 +++
 .../java/net/runelite/rs/client/class85.java  |  5 +++
 .../java/net/runelite/rs/client/class97.java  | 15 ++++++++
 .../java/net/runelite/rs/client/class98.java  | 12 +++++++
 .../java/net/runelite/rs/client/client.java   | 28 +++++++++++++++
 48 files changed, 305 insertions(+)

diff --git a/src/main/java/net/runelite/rs/client/class0.java b/src/main/java/net/runelite/rs/client/class0.java
index 48d699a440..be98dcc76d 100644
--- a/src/main/java/net/runelite/rs/client/class0.java
+++ b/src/main/java/net/runelite/rs/client/class0.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.RandomAccessFile;
 import java.net.MalformedURLException;
 import java.net.URL;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -45,6 +46,7 @@ public class class0 extends class207 {
    @ObfuscatedName("j")
    Object[] field10;
    @ObfuscatedName("hl")
+   @Export("localPlayer")
    static class2 field12;
    @ObfuscatedName("x")
    public static String field14;
diff --git a/src/main/java/net/runelite/rs/client/class100.java b/src/main/java/net/runelite/rs/client/class100.java
index a9d085226c..f679358557 100644
--- a/src/main/java/net/runelite/rs/client/class100.java
+++ b/src/main/java/net/runelite/rs/client/class100.java
@@ -6,10 +6,13 @@ import java.io.OutputStreamWriter;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Random;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("cu")
+@Implements("Tile")
 public final class class100 extends class207 {
    @ObfuscatedName("a")
    class96 field1716;
@@ -28,6 +31,7 @@ public final class class100 extends class207 {
    @ObfuscatedName("u")
    class88 field1720;
    @ObfuscatedName("k")
+   @Export("itemLayer")
    class98 field1721;
    @ObfuscatedName("h")
    class86 field1722;
@@ -44,8 +48,10 @@ public final class class100 extends class207 {
    @ObfuscatedGetter(
       intValue = -1533965455
    )
+   @Export("plane")
    int field1726;
    @ObfuscatedName("w")
+   @Export("objects")
    class97[] field1727 = new class97[5];
    @ObfuscatedName("z")
    @ObfuscatedGetter(
@@ -56,6 +62,7 @@ public final class class100 extends class207 {
    @ObfuscatedGetter(
       intValue = -2057134613
    )
+   @Export("y")
    int field1729;
    @ObfuscatedName("p")
    @ObfuscatedGetter(
@@ -89,6 +96,7 @@ public final class class100 extends class207 {
    @ObfuscatedGetter(
       intValue = 262047279
    )
+   @Export("x")
    int field1738;
 
    @ObfuscatedName("a")
diff --git a/src/main/java/net/runelite/rs/client/class104.java b/src/main/java/net/runelite/rs/client/class104.java
index cebf5f0ce9..eef2910680 100644
--- a/src/main/java/net/runelite/rs/client/class104.java
+++ b/src/main/java/net/runelite/rs/client/class104.java
@@ -1,8 +1,10 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("da")
+@Implements("Model")
 public class class104 extends class84 {
    @ObfuscatedName("az")
    static boolean[] field1775 = new boolean[4096];
diff --git a/src/main/java/net/runelite/rs/client/class107.java b/src/main/java/net/runelite/rs/client/class107.java
index 744d229a70..610cc926e6 100644
--- a/src/main/java/net/runelite/rs/client/class107.java
+++ b/src/main/java/net/runelite/rs/client/class107.java
@@ -3,10 +3,13 @@ package net.runelite.rs.client;
 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;
 
 @ObfuscatedName("dh")
+@Implements("CollisionData")
 public class class107 {
    @ObfuscatedName("av")
    @ObfuscatedGetter(
@@ -14,6 +17,7 @@ public class class107 {
    )
    int field1869;
    @ObfuscatedName("at")
+   @Export("flags")
    public int[][] field1879;
    @ObfuscatedName("ay")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class11.java b/src/main/java/net/runelite/rs/client/class11.java
index bf3ed8aa92..73983d5cb8 100644
--- a/src/main/java/net/runelite/rs/client/class11.java
+++ b/src/main/java/net/runelite/rs/client/class11.java
@@ -2,6 +2,7 @@ package net.runelite.rs.client;
 
 import java.util.HashMap;
 import java.util.Map;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -17,6 +18,7 @@ public class class11 {
    @ObfuscatedGetter(
       intValue = 1926067081
    )
+   @Export("cameraPitch")
    static int field169;
    @ObfuscatedName("ch")
    static class142 field170;
diff --git a/src/main/java/net/runelite/rs/client/class118.java b/src/main/java/net/runelite/rs/client/class118.java
index dfd71574f6..5021886609 100644
--- a/src/main/java/net/runelite/rs/client/class118.java
+++ b/src/main/java/net/runelite/rs/client/class118.java
@@ -1,21 +1,26 @@
 package net.runelite.rs.client;
 
 import java.math.BigInteger;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("dc")
+@Implements("Buffer")
 public class class118 extends class207 {
    @ObfuscatedName("f")
    static int[] field1978 = new int[256];
    @ObfuscatedName("i")
    public static short[][] field1979;
    @ObfuscatedName("j")
+   @Export("payload")
    public byte[] field1980;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 2014740975
    )
+   @Export("offset")
    public int field1981;
    @ObfuscatedName("u")
    static long[] field1982;
diff --git a/src/main/java/net/runelite/rs/client/class132.java b/src/main/java/net/runelite/rs/client/class132.java
index c90afc00cd..072090e1d1 100644
--- a/src/main/java/net/runelite/rs/client/class132.java
+++ b/src/main/java/net/runelite/rs/client/class132.java
@@ -1,6 +1,7 @@
 package net.runelite.rs.client;
 
 import java.io.IOException;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -10,6 +11,7 @@ public abstract class class132 {
    @ObfuscatedGetter(
       intValue = 2135240255
    )
+   @Export("cameraZ")
    static int field2053;
 
    @ObfuscatedName("j")
diff --git a/src/main/java/net/runelite/rs/client/class143.java b/src/main/java/net/runelite/rs/client/class143.java
index 2b57b5eec1..9a15407005 100644
--- a/src/main/java/net/runelite/rs/client/class143.java
+++ b/src/main/java/net/runelite/rs/client/class143.java
@@ -12,10 +12,13 @@ import java.awt.event.FocusListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.net.URL;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("eb")
+@Implements("GameEngine")
 public abstract class class143 extends Applet implements Runnable, FocusListener, WindowListener {
    @ObfuscatedName("cs")
    static class223 field2174;
@@ -42,6 +45,7 @@ public abstract class class143 extends Applet implements Runnable, FocusListener
    @ObfuscatedGetter(
       intValue = -587476029
    )
+   @Export("fPS")
    protected static int field2181 = 0;
    @ObfuscatedName("qr")
    protected static long[] field2182 = new long[32];
diff --git a/src/main/java/net/runelite/rs/client/class15.java b/src/main/java/net/runelite/rs/client/class15.java
index fa3fdcbed6..3892fd09ed 100644
--- a/src/main/java/net/runelite/rs/client/class15.java
+++ b/src/main/java/net/runelite/rs/client/class15.java
@@ -1,17 +1,23 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("r")
+@Implements("XItemContainer")
 public class class15 extends class207 {
    @ObfuscatedName("nl")
    static class56 field212;
    @ObfuscatedName("f")
+   @Export("stackSizes")
    int[] field214 = new int[]{0};
    @ObfuscatedName("j")
+   @Export("itemContainers")
    static class195 field216 = new class195(32);
    @ObfuscatedName("m")
+   @Export("itemIds")
    int[] field217 = new int[]{-1};
    @ObfuscatedName("by")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class161.java b/src/main/java/net/runelite/rs/client/class161.java
index 2c5e298c59..6faf248759 100644
--- a/src/main/java/net/runelite/rs/client/class161.java
+++ b/src/main/java/net/runelite/rs/client/class161.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -11,6 +12,7 @@ public final class class161 {
    @ObfuscatedGetter(
       intValue = -1440649607
    )
+   @Export("baseY")
    static int field2629;
    @ObfuscatedName("o")
    static class13 field2632;
diff --git a/src/main/java/net/runelite/rs/client/class17.java b/src/main/java/net/runelite/rs/client/class17.java
index eba6d80542..65c6121b60 100644
--- a/src/main/java/net/runelite/rs/client/class17.java
+++ b/src/main/java/net/runelite/rs/client/class17.java
@@ -5,19 +5,24 @@ import java.awt.Color;
 import java.awt.Container;
 import java.awt.Graphics;
 import java.awt.Insets;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("n")
+@Implements("Friend")
 public class class17 {
    @ObfuscatedName("t")
    static byte[][] field236;
    @ObfuscatedName("j")
+   @Export("name")
    String field237;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 284396947
    )
+   @Export("world")
    int field238;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
@@ -27,6 +32,7 @@ public class class17 {
    @ObfuscatedName("a")
    boolean field240;
    @ObfuscatedName("m")
+   @Export("previousName")
    String field241;
    @ObfuscatedName("u")
    boolean field243;
diff --git a/src/main/java/net/runelite/rs/client/class172.java b/src/main/java/net/runelite/rs/client/class172.java
index a2d374f723..debe4fd3fe 100644
--- a/src/main/java/net/runelite/rs/client/class172.java
+++ b/src/main/java/net/runelite/rs/client/class172.java
@@ -1,13 +1,18 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("fv")
+@Implements("Widget")
 public class class172 extends class207 {
    @ObfuscatedName("ax")
+   @Export("isHidden")
    public boolean field2724 = false;
    @ObfuscatedName("m")
+   @Export("validInterfaces")
    static boolean[] field2725;
    @ObfuscatedName("f")
    static class166 field2726;
@@ -34,6 +39,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -1157286855
    )
+   @Export("index")
    public int field2735 = -1;
    @ObfuscatedName("p")
    @ObfuscatedGetter(
@@ -49,6 +55,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -1953257935
    )
+   @Export("contentType")
    public int field2738 = 0;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
@@ -69,6 +76,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -1142692655
    )
+   @Export("parentId")
    public int field2742 = -1;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
@@ -90,16 +98,19 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = 1426033919
    )
+   @Export("relativeY")
    public int field2748 = 0;
    @ObfuscatedName("ao")
    @ObfuscatedGetter(
       intValue = 22288699
    )
+   @Export("width")
    public int field2749 = 0;
    @ObfuscatedName("as")
    @ObfuscatedGetter(
       intValue = 1562285645
    )
+   @Export("height")
    public int field2750 = 0;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
@@ -119,8 +130,10 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -14221453
    )
+   @Export("itemId")
    public int field2755 = 0;
    @ObfuscatedName("bw")
+   @Export("text")
    public String field2756 = "";
    @ObfuscatedName("db")
    public int[] field2757;
@@ -132,6 +145,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -878760671
    )
+   @Export("rotationZ")
    public int field2760 = 0;
    @ObfuscatedName("bo")
    @ObfuscatedGetter(
@@ -142,6 +156,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -790030913
    )
+   @Export("scrollY")
    public int field2762 = 0;
    @ObfuscatedName("ah")
    public boolean field2763 = false;
@@ -178,6 +193,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = 385730901
    )
+   @Export("borderThickness")
    public int field2771 = 0;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
@@ -192,16 +208,19 @@ public class class172 extends class207 {
    @ObfuscatedName("bj")
    public boolean field2774;
    @ObfuscatedName("ch")
+   @Export("parent")
    public class172 field2775 = null;
    @ObfuscatedName("bf")
    @ObfuscatedGetter(
       intValue = -2085325033
    )
+   @Export("modelId")
    public int field2776 = -1;
    @ObfuscatedName("bn")
    @ObfuscatedGetter(
       intValue = 1076693301
    )
+   @Export("modelType")
    public int field2777 = 1;
    @ObfuscatedName("bc")
    @ObfuscatedGetter(
@@ -232,18 +251,22 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = 143381333
    )
+   @Export("rotationX")
    public int field2783 = 0;
    @ObfuscatedName("ak")
    @ObfuscatedGetter(
       intValue = 1209300247
    )
+   @Export("opacity")
    public int field2784 = 0;
    @ObfuscatedName("bl")
    @ObfuscatedGetter(
       intValue = 544106025
    )
+   @Export("rotationY")
    public int field2785 = 0;
    @ObfuscatedName("cm")
+   @Export("actions")
    public String[] field2786;
    @ObfuscatedName("bg")
    @ObfuscatedGetter(
@@ -315,8 +338,10 @@ public class class172 extends class207 {
    )
    public int field2804 = 0;
    @ObfuscatedName("cz")
+   @Export("name")
    public String field2805 = "";
    @ObfuscatedName("ea")
+   @Export("children")
    public class172[] field2806;
    @ObfuscatedName("dn")
    public Object[] field2807;
@@ -368,6 +393,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = -149325679
    )
+   @Export("textColor")
    public int field2824 = 0;
    @ObfuscatedName("ci")
    public Object[] field2825;
@@ -420,6 +446,7 @@ public class class172 extends class207 {
    @ObfuscatedName("de")
    public Object[] field2843;
    @ObfuscatedName("dp")
+   @Export("dynamicValues")
    public int[][] field2844;
    @ObfuscatedName("dm")
    public int[] field2845;
@@ -427,6 +454,8 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = 369792335
    )
+   //@Export("relativeX")
+   @Export("scrollX")
    public int field2846 = 0;
    @ObfuscatedName("dy")
    @ObfuscatedGetter(
@@ -438,13 +467,17 @@ public class class172 extends class207 {
    @ObfuscatedName("dg")
    public String field2849 = "Ok";
    @ObfuscatedName("dx")
+   @Export("itemIds")
    public int[] field2850;
    @ObfuscatedName("dj")
+   @Export("itemQuantities")
    public int[] field2851;
    @ObfuscatedName("em")
    @ObfuscatedGetter(
       intValue = 330795751
    )
+   @Export("type")
+   //@Export("itemQuantity")
    public int field2852 = -1;
    @ObfuscatedName("ec")
    @ObfuscatedGetter(
@@ -464,6 +497,7 @@ public class class172 extends class207 {
    )
    public int field2856 = 0;
    @ObfuscatedName("j")
+   @Export("widgets")
    public static class172[][] field2857;
    @ObfuscatedName("cs")
    public Object[] field2858;
@@ -488,6 +522,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = 378529589
    )
+   @Export("boundsIndex")
    public int field2863 = -1;
    @ObfuscatedName("ca")
    @ObfuscatedGetter(
@@ -500,6 +535,7 @@ public class class172 extends class207 {
    @ObfuscatedGetter(
       intValue = 1740819181
    )
+   @Export("textureId")
    public int field2866 = -1;
 
    @ObfuscatedName("a")
diff --git a/src/main/java/net/runelite/rs/client/class175.java b/src/main/java/net/runelite/rs/client/class175.java
index 427f2811cd..10d638b27f 100644
--- a/src/main/java/net/runelite/rs/client/class175.java
+++ b/src/main/java/net/runelite/rs/client/class175.java
@@ -1,14 +1,17 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("fu")
 public class class175 {
    @ObfuscatedName("f")
+   @Export("widgetSettings")
    public static int[] field2884;
    @ObfuscatedName("j")
    static int[] field2885 = new int[32];
    @ObfuscatedName("m")
+   @Export("settings")
    public static int[] field2887;
 
    static {
diff --git a/src/main/java/net/runelite/rs/client/class19.java b/src/main/java/net/runelite/rs/client/class19.java
index 40dcdcd71e..aaeae0e5fd 100644
--- a/src/main/java/net/runelite/rs/client/class19.java
+++ b/src/main/java/net/runelite/rs/client/class19.java
@@ -2,10 +2,13 @@ package net.runelite.rs.client;
 
 import java.io.EOFException;
 import java.util.Date;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("v")
+@Implements("PlayerComposition")
 public class class19 {
    @ObfuscatedName("cm")
    static class145 field259;
@@ -31,6 +34,7 @@ public class class19 {
    )
    static int field268;
    @ObfuscatedName("h")
+   @Export("isFemale")
    boolean field269 = false;
    @ObfuscatedName("dc")
    static byte[][] field270;
diff --git a/src/main/java/net/runelite/rs/client/class195.java b/src/main/java/net/runelite/rs/client/class195.java
index 6d31f76a9d..b8994ac586 100644
--- a/src/main/java/net/runelite/rs/client/class195.java
+++ b/src/main/java/net/runelite/rs/client/class195.java
@@ -1,8 +1,10 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("gs")
+@Implements("XHashTable")
 public final class class195 {
    @ObfuscatedName("u")
    int field3077 = 0;
diff --git a/src/main/java/net/runelite/rs/client/class198.java b/src/main/java/net/runelite/rs/client/class198.java
index 79f1fd5596..79b9cba188 100644
--- a/src/main/java/net/runelite/rs/client/class198.java
+++ b/src/main/java/net/runelite/rs/client/class198.java
@@ -1,12 +1,17 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("gu")
+@Implements("Deque")
 public class class198 {
    @ObfuscatedName("j")
+   @Export("head")
    public class207 field3086 = new class207();
    @ObfuscatedName("m")
+   @Export("current")
    class207 field3087;
 
    @ObfuscatedName("j")
diff --git a/src/main/java/net/runelite/rs/client/class2.java b/src/main/java/net/runelite/rs/client/class2.java
index c2dd0225fc..c7146c0bd4 100644
--- a/src/main/java/net/runelite/rs/client/class2.java
+++ b/src/main/java/net/runelite/rs/client/class2.java
@@ -1,11 +1,15 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("f")
+@Implements("Player")
 public final class class2 extends class37 {
    @ObfuscatedName("m")
+   @Export("composition")
    class178 field31;
    @ObfuscatedName("a")
    String[] field32 = new String[3];
@@ -15,6 +19,7 @@ public final class class2 extends class37 {
    )
    int field33 = -1;
    @ObfuscatedName("j")
+   @Export("name")
    String field34;
    @ObfuscatedName("x")
    boolean field35;
@@ -32,6 +37,7 @@ public final class class2 extends class37 {
    @ObfuscatedGetter(
       intValue = 1312493237
    )
+   @Export("totalLevel")
    int field39;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
@@ -54,6 +60,7 @@ public final class class2 extends class37 {
    )
    int field43;
    @ObfuscatedName("p")
+   @Export("model")
    class104 field44;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
@@ -81,6 +88,7 @@ public final class class2 extends class37 {
    @ObfuscatedGetter(
       intValue = -252226933
    )
+   @Export("team")
    int field50;
    @ObfuscatedName("aa")
    @ObfuscatedGetter(
@@ -96,6 +104,7 @@ public final class class2 extends class37 {
    @ObfuscatedGetter(
       intValue = -249902191
    )
+   @Export("combatLevel")
    int field53;
    @ObfuscatedName("c")
    boolean field54;
diff --git a/src/main/java/net/runelite/rs/client/class203.java b/src/main/java/net/runelite/rs/client/class203.java
index f1de1b26e8..7b4bcb8e2d 100644
--- a/src/main/java/net/runelite/rs/client/class203.java
+++ b/src/main/java/net/runelite/rs/client/class203.java
@@ -1,12 +1,17 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("gx")
+@Implements("CacheableNode")
 public class class203 extends class207 {
    @ObfuscatedName("cg")
+   @Export("previous")
    public class203 field3092;
    @ObfuscatedName("cf")
+   @Export("next")
    public class203 field3093;
 
    @ObfuscatedName("fn")
diff --git a/src/main/java/net/runelite/rs/client/class207.java b/src/main/java/net/runelite/rs/client/class207.java
index fbb506aff3..0e4d00e576 100644
--- a/src/main/java/net/runelite/rs/client/class207.java
+++ b/src/main/java/net/runelite/rs/client/class207.java
@@ -1,14 +1,20 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("gt")
+@Implements("Node")
 public class class207 {
    @ObfuscatedName("es")
+   @Export("next")
    public class207 field3102;
    @ObfuscatedName("ee")
+   @Export("previous")
    class207 field3103;
    @ObfuscatedName("eg")
+   @Export("hash")
    public long field3104;
 
    @ObfuscatedName("ip")
diff --git a/src/main/java/net/runelite/rs/client/class209.java b/src/main/java/net/runelite/rs/client/class209.java
index ed18d9f130..8ddb6875c4 100644
--- a/src/main/java/net/runelite/rs/client/class209.java
+++ b/src/main/java/net/runelite/rs/client/class209.java
@@ -2,12 +2,16 @@ package net.runelite.rs.client;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("hl")
+@Implements("ClassInfo")
 public class class209 extends class207 {
    @ObfuscatedName("i")
+   @Export("methods")
    Method[] field3107;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
@@ -17,6 +21,7 @@ public class class209 extends class207 {
    @ObfuscatedName("u")
    int[] field3109;
    @ObfuscatedName("h")
+   @Export("fields")
    Field[] field3110;
    @ObfuscatedName("a")
    int[] field3111;
@@ -28,6 +33,7 @@ public class class209 extends class207 {
    )
    int field3113;
    @ObfuscatedName("m")
+   @Export("args")
    byte[][][] field3114;
 
    @ObfuscatedName("x")
diff --git a/src/main/java/net/runelite/rs/client/class219.java b/src/main/java/net/runelite/rs/client/class219.java
index 596da4311d..e20cff7792 100644
--- a/src/main/java/net/runelite/rs/client/class219.java
+++ b/src/main/java/net/runelite/rs/client/class219.java
@@ -1,36 +1,45 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("hs")
+@Implements("XGrandExchangeOffer")
 public class class219 {
    @ObfuscatedName("j")
+   @Export("progress")
    byte field3149;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1518557493
    )
+   @Export("itemId")
    public int field3150;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1405506295
    )
+   @Export("price")
    public int field3151;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 1708138833
    )
+   @Export("totalQuantity")
    public int field3152;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -2046919749
    )
+   @Export("quantitySold")
    public int field3153;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = 1723392219
    )
+   @Export("spent")
    public int field3154;
    @ObfuscatedName("im")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class226.java b/src/main/java/net/runelite/rs/client/class226.java
index ff5c07ee3d..b81a531fdd 100644
--- a/src/main/java/net/runelite/rs/client/class226.java
+++ b/src/main/java/net/runelite/rs/client/class226.java
@@ -4,22 +4,28 @@ import java.io.EOFException;
 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;
 
 @ObfuscatedName("hm")
+@Implements("FileOnDisk")
 public final class class226 {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       longValue = -5491611329971135641L
    )
+   @Export("length")
    long field3197;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       longValue = -1222268832551527705L
    )
+   @Export("position")
    long field3198;
    @ObfuscatedName("j")
+   @Export("file")
    RandomAccessFile field3199;
 
    @ObfuscatedName("j")
diff --git a/src/main/java/net/runelite/rs/client/class24.java b/src/main/java/net/runelite/rs/client/class24.java
index eb73016ed9..a41e9c6459 100644
--- a/src/main/java/net/runelite/rs/client/class24.java
+++ b/src/main/java/net/runelite/rs/client/class24.java
@@ -1,11 +1,15 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("c")
+@Implements("XClanMember")
 public class class24 extends class207 {
    @ObfuscatedName("j")
+   @Export("username")
    String field604;
    @ObfuscatedName("m")
    String field605;
@@ -13,8 +17,10 @@ public class class24 extends class207 {
    @ObfuscatedGetter(
       intValue = -1116075037
    )
+   @Export("world")
    int field606;
    @ObfuscatedName("l")
+   @Export("rank")
    byte field607;
    @ObfuscatedName("fd")
    @ObfuscatedGetter(
@@ -22,6 +28,7 @@ public class class24 extends class207 {
    )
    static int field609;
    @ObfuscatedName("dk")
+   @Export("region")
    static class85 field610;
 
    @ObfuscatedName("l")
diff --git a/src/main/java/net/runelite/rs/client/class25.java b/src/main/java/net/runelite/rs/client/class25.java
index d3ae62eba4..1fc385edaf 100644
--- a/src/main/java/net/runelite/rs/client/class25.java
+++ b/src/main/java/net/runelite/rs/client/class25.java
@@ -1,11 +1,15 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("b")
+@Implements("World")
 public class class25 {
    @ObfuscatedName("u")
+   @Export("worldList")
    static class25[] field615;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
@@ -20,6 +24,7 @@ public class class25 {
    @ObfuscatedGetter(
       intValue = -696630233
    )
+   @Export("id")
    int field621;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
@@ -32,6 +37,7 @@ public class class25 {
    )
    static int field623 = 0;
    @ObfuscatedName("z")
+   @Export("address")
    String field624;
    @ObfuscatedName("jx")
    @ObfuscatedGetter(
@@ -42,11 +48,13 @@ public class class25 {
    @ObfuscatedGetter(
       intValue = -634971913
    )
+   @Export("playerCount")
    int field626;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 60515985
    )
+   @Export("mask")
    int field627;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class28.java b/src/main/java/net/runelite/rs/client/class28.java
index 712eb5896f..28fb1b27a9 100644
--- a/src/main/java/net/runelite/rs/client/class28.java
+++ b/src/main/java/net/runelite/rs/client/class28.java
@@ -1,15 +1,19 @@
 package net.runelite.rs.client;
 
 import java.awt.event.ActionEvent;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("as")
+@Implements("Item")
 public final class class28 extends class84 {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -748024123
    )
+   @Export("quantity")
    int field658;
    @ObfuscatedName("a")
    static class72 field659;
@@ -17,6 +21,7 @@ public final class class28 extends class84 {
    @ObfuscatedGetter(
       intValue = -1494914441
    )
+   @Export("id")
    int field660;
 
    @ObfuscatedName("cy")
diff --git a/src/main/java/net/runelite/rs/client/class29.java b/src/main/java/net/runelite/rs/client/class29.java
index 437282aeff..a134d3c868 100644
--- a/src/main/java/net/runelite/rs/client/class29.java
+++ b/src/main/java/net/runelite/rs/client/class29.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -48,6 +49,7 @@ public final class class29 extends class84 {
    @ObfuscatedGetter(
       intValue = 1636528285
    )
+   @Export("cameraX")
    static int field672;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class3.java b/src/main/java/net/runelite/rs/client/class3.java
index e602ea2964..4dcd1d6f79 100644
--- a/src/main/java/net/runelite/rs/client/class3.java
+++ b/src/main/java/net/runelite/rs/client/class3.java
@@ -1,9 +1,12 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("l")
+@Implements("WidgetNode")
 public class class3 extends class207 {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
@@ -16,6 +19,7 @@ public class class3 extends class207 {
    @ObfuscatedGetter(
       intValue = 16913577
    )
+   @Export("id")
    int field63;
    @ObfuscatedName("ah")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class31.java b/src/main/java/net/runelite/rs/client/class31.java
index 58eb03c923..850e7feb9c 100644
--- a/src/main/java/net/runelite/rs/client/class31.java
+++ b/src/main/java/net/runelite/rs/client/class31.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -67,6 +68,7 @@ public class class31 {
    @ObfuscatedName("at")
    static String field712;
    @ObfuscatedName("al")
+   @Export("username")
    static String field713;
    @ObfuscatedName("ap")
    static String field714;
diff --git a/src/main/java/net/runelite/rs/client/class34.java b/src/main/java/net/runelite/rs/client/class34.java
index 896d205703..7a329b988d 100644
--- a/src/main/java/net/runelite/rs/client/class34.java
+++ b/src/main/java/net/runelite/rs/client/class34.java
@@ -3,10 +3,13 @@ package net.runelite.rs.client;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.Iterator;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("az")
+@Implements("NPC")
 public final class class34 extends class37 {
    @ObfuscatedName("py")
    @ObfuscatedGetter(
@@ -16,6 +19,7 @@ public final class class34 extends class37 {
    @ObfuscatedName("ew")
    static class80[] field760;
    @ObfuscatedName("j")
+   @Export("composition")
    class39 field761;
    @ObfuscatedName("s")
    static int[] field764;
diff --git a/src/main/java/net/runelite/rs/client/class35.java b/src/main/java/net/runelite/rs/client/class35.java
index 96764e4521..3f82ab64eb 100644
--- a/src/main/java/net/runelite/rs/client/class35.java
+++ b/src/main/java/net/runelite/rs/client/class35.java
@@ -1,9 +1,12 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("av")
+@Implements("MessageNode")
 public class class35 extends class203 {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
@@ -14,6 +17,7 @@ public class class35 extends class203 {
    @ObfuscatedGetter(
       intValue = -1804049261
    )
+   @Export("type")
    int field768;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
@@ -23,6 +27,7 @@ public class class35 extends class203 {
    @ObfuscatedName("u")
    String field770;
    @ObfuscatedName("a")
+   @Export("value")
    String field771;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
@@ -30,6 +35,7 @@ public class class35 extends class203 {
    )
    static int field773;
    @ObfuscatedName("l")
+   @Export("sender")
    String field774;
    @ObfuscatedName("nj")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class37.java b/src/main/java/net/runelite/rs/client/class37.java
index b3e115149f..00fa724887 100644
--- a/src/main/java/net/runelite/rs/client/class37.java
+++ b/src/main/java/net/runelite/rs/client/class37.java
@@ -3,10 +3,13 @@ package net.runelite.rs.client;
 import java.awt.Component;
 import java.io.DataInputStream;
 import java.net.URL;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("at")
+@Implements("Actor")
 public abstract class class37 extends class84 {
    @ObfuscatedName("au")
    @ObfuscatedGetter(
@@ -75,6 +78,7 @@ public abstract class class37 extends class84 {
    @ObfuscatedName("ah")
    boolean field812;
    @ObfuscatedName("ak")
+   @Export("inSequence")
    boolean field813 = false;
    @ObfuscatedName("ag")
    @ObfuscatedGetter(
@@ -96,11 +100,13 @@ public abstract class class37 extends class84 {
    )
    int field818 = -1;
    @ObfuscatedName("aj")
+   @Export("hitCycle")
    int[] field819 = new int[4];
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = 23796935
    )
+   @Export("loopCycle")
    int field820 = -1000;
    @ObfuscatedName("br")
    @ObfuscatedGetter(
@@ -116,6 +122,7 @@ public abstract class class37 extends class84 {
    @ObfuscatedGetter(
       intValue = -154519275
    )
+   @Export("interacting")
    int field823 = -1;
    @ObfuscatedName("bf")
    boolean field824 = false;
@@ -143,6 +150,7 @@ public abstract class class37 extends class84 {
    @ObfuscatedGetter(
       intValue = 965521915
    )
+   @Export("animation")
    int field829 = -1;
    @ObfuscatedName("bq")
    @ObfuscatedGetter(
@@ -163,11 +171,13 @@ public abstract class class37 extends class84 {
    @ObfuscatedGetter(
       intValue = 2076125665
    )
+   @Export("health")
    int field833;
    @ObfuscatedName("as")
    @ObfuscatedGetter(
       intValue = -2042807017
    )
+   @Export("y")
    int field834;
    @ObfuscatedName("bt")
    @ObfuscatedGetter(
@@ -225,6 +235,7 @@ public abstract class class37 extends class84 {
    @ObfuscatedGetter(
       intValue = 524459231
    )
+   @Export("x")
    int field846;
    @ObfuscatedName("af")
    int[] field847 = new int[4];
@@ -249,11 +260,13 @@ public abstract class class37 extends class84 {
    )
    int field851 = 0;
    @ObfuscatedName("ar")
+   @Export("overhead")
    String field852 = null;
    @ObfuscatedName("bj")
    @ObfuscatedGetter(
       intValue = 778956329
    )
+   @Export("maxHealth")
    int field853;
    @ObfuscatedName("bl")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class39.java b/src/main/java/net/runelite/rs/client/class39.java
index 2a9b545916..614304130b 100644
--- a/src/main/java/net/runelite/rs/client/class39.java
+++ b/src/main/java/net/runelite/rs/client/class39.java
@@ -1,10 +1,13 @@
 package net.runelite.rs.client;
 
 import java.awt.Frame;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ac")
+@Implements("NPCComposition")
 public class class39 extends class203 {
    @ObfuscatedName("s")
    @ObfuscatedGetter(
@@ -22,8 +25,10 @@ public class class39 extends class203 {
    @ObfuscatedGetter(
       intValue = 209287787
    )
+   @Export("id")
    public int field869;
    @ObfuscatedName("a")
+   @Export("name")
    public String field870 = "null";
    @ObfuscatedName("h")
    @ObfuscatedGetter(
@@ -43,6 +48,7 @@ public class class39 extends class203 {
    )
    int field874 = -1;
    @ObfuscatedName("i")
+   @Export("models")
    int[] field875;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
@@ -70,13 +76,16 @@ public class class39 extends class203 {
    @ObfuscatedName("l")
    static class192 field884 = new class192(50);
    @ObfuscatedName("q")
+   @Export("actions")
    public String[] field885 = new String[5];
    @ObfuscatedName("x")
+   @Export("isClickable")
    public boolean field886 = true;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 638513191
    )
+   @Export("combatLevel")
    public int field887 = -1;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
@@ -84,6 +93,7 @@ public class class39 extends class203 {
    )
    int field888 = 128;
    @ObfuscatedName("b")
+   @Export("isVisible")
    public boolean field890 = false;
    @ObfuscatedName("aa")
    @ObfuscatedGetter(
@@ -120,6 +130,7 @@ public class class39 extends class203 {
    @ObfuscatedName("av")
    public boolean field898 = false;
    @ObfuscatedName("az")
+   @Export("isMinimapVisible")
    public boolean field899 = true;
    @ObfuscatedName("v")
    short[] field900;
diff --git a/src/main/java/net/runelite/rs/client/class40.java b/src/main/java/net/runelite/rs/client/class40.java
index f58f16e124..c354f22fa4 100644
--- a/src/main/java/net/runelite/rs/client/class40.java
+++ b/src/main/java/net/runelite/rs/client/class40.java
@@ -1,10 +1,13 @@
 package net.runelite.rs.client;
 
 import java.awt.Graphics;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ar")
+@Implements("ObjectComposition")
 public class class40 extends class203 {
    @ObfuscatedName("ac")
    public boolean field905 = false;
@@ -31,6 +34,7 @@ public class class40 extends class203 {
    @ObfuscatedName("s")
    int[] field913;
    @ObfuscatedName("w")
+   @Export("name")
    public String field914 = "null";
    @ObfuscatedName("e")
    short[] field915;
@@ -89,6 +93,7 @@ public class class40 extends class203 {
    )
    int field930 = 0;
    @ObfuscatedName("as")
+   @Export("actions")
    public String[] field931 = new String[5];
    @ObfuscatedName("am")
    boolean field933 = false;
diff --git a/src/main/java/net/runelite/rs/client/class42.java b/src/main/java/net/runelite/rs/client/class42.java
index 04307de28b..a0e7a48fb2 100644
--- a/src/main/java/net/runelite/rs/client/class42.java
+++ b/src/main/java/net/runelite/rs/client/class42.java
@@ -1,14 +1,18 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ak")
+@Implements("Sequence")
 public class class42 extends class203 {
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = -1032111723
    )
+   @Export("replyMode")
    public int field969 = 2;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
@@ -33,13 +37,16 @@ public class class42 extends class203 {
    )
    public int field977 = 1;
    @ObfuscatedName("s")
+   @Export("interleaveLeave")
    int[] field978;
    @ObfuscatedName("w")
+   @Export("stretches")
    public boolean field979 = false;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -1404598901
    )
+   @Export("precedenceAnimating")
    public int field980 = -1;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
@@ -55,6 +62,7 @@ public class class42 extends class203 {
    @ObfuscatedGetter(
       intValue = 1200371909
    )
+   @Export("maxLoops")
    public int field983 = 99;
    @ObfuscatedName("rs")
    protected static String field984;
diff --git a/src/main/java/net/runelite/rs/client/class47.java b/src/main/java/net/runelite/rs/client/class47.java
index 5e5be6d064..7cd183942f 100644
--- a/src/main/java/net/runelite/rs/client/class47.java
+++ b/src/main/java/net/runelite/rs/client/class47.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -25,6 +26,7 @@ public class class47 extends class203 {
    @ObfuscatedGetter(
       intValue = -1084232987
    )
+   @Export("baseX")
    static int field1053;
    @ObfuscatedName("z")
    public static class171 field1054;
diff --git a/src/main/java/net/runelite/rs/client/class5.java b/src/main/java/net/runelite/rs/client/class5.java
index dab0398a47..56d4368d0f 100644
--- a/src/main/java/net/runelite/rs/client/class5.java
+++ b/src/main/java/net/runelite/rs/client/class5.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -23,6 +24,7 @@ public final class class5 {
    @ObfuscatedName("q")
    static final int[] field78 = new int[]{1, 0, -1, 0};
    @ObfuscatedName("j")
+   @Export("tileHeights")
    static int[][][] field79 = new int[4][105][105];
    @ObfuscatedName("y")
    static final int[] field82 = new int[]{1, 2, 4, 8};
@@ -33,6 +35,7 @@ public final class class5 {
    @ObfuscatedName("l")
    static byte[][][] field85;
    @ObfuscatedName("m")
+   @Export("tileSettings")
    static byte[][][] field86 = new byte[4][104][104];
    @ObfuscatedName("x")
    static final int[] field87 = new int[]{0, -1, 0, 1};
diff --git a/src/main/java/net/runelite/rs/client/class51.java b/src/main/java/net/runelite/rs/client/class51.java
index 96e8c83fcb..16031d0b28 100644
--- a/src/main/java/net/runelite/rs/client/class51.java
+++ b/src/main/java/net/runelite/rs/client/class51.java
@@ -2,10 +2,13 @@ package net.runelite.rs.client;
 
 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;
 
 @ObfuscatedName("an")
+@Implements("ItemComposition")
 public class class51 extends class203 {
    @ObfuscatedName("x")
    @ObfuscatedGetter(
@@ -44,6 +47,7 @@ public class class51 extends class203 {
    )
    int field1098;
    @ObfuscatedName("z")
+   @Export("name")
    public String field1099 = "null";
    @ObfuscatedName("p")
    short[] field1100;
@@ -91,6 +95,7 @@ public class class51 extends class203 {
    )
    public int field1111 = 1;
    @ObfuscatedName("aa")
+   @Export("isMembers")
    public boolean field1112 = false;
    @ObfuscatedName("s")
    static class223 field1113;
diff --git a/src/main/java/net/runelite/rs/client/class6.java b/src/main/java/net/runelite/rs/client/class6.java
index 2b3af3378f..4f94043a8e 100644
--- a/src/main/java/net/runelite/rs/client/class6.java
+++ b/src/main/java/net/runelite/rs/client/class6.java
@@ -1,9 +1,12 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("h")
+@Implements("Projectile")
 public final class class6 extends class84 {
    @ObfuscatedName("o")
    @ObfuscatedGetter(
@@ -67,8 +70,10 @@ public final class class6 extends class84 {
    )
    int field107;
    @ObfuscatedName("r")
+   @Export("velocityX")
    double field108;
    @ObfuscatedName("g")
+   @Export("velocityY")
    double field109;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
@@ -76,6 +81,7 @@ public final class class6 extends class84 {
    )
    int field110;
    @ObfuscatedName("y")
+   @Export("velocityZ")
    double field111;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
@@ -90,6 +96,7 @@ public final class class6 extends class84 {
    )
    int field114;
    @ObfuscatedName("d")
+   @Export("animationSequence")
    class42 field115;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
@@ -97,8 +104,10 @@ public final class class6 extends class84 {
    )
    int field116 = 0;
    @ObfuscatedName("n")
+   @Export("scalar")
    double field117;
    @ObfuscatedName("w")
+   @Export("isMoving")
    boolean field120 = false;
 
    class6(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
diff --git a/src/main/java/net/runelite/rs/client/class7.java b/src/main/java/net/runelite/rs/client/class7.java
index fae9e7594a..abb3e39fdf 100644
--- a/src/main/java/net/runelite/rs/client/class7.java
+++ b/src/main/java/net/runelite/rs/client/class7.java
@@ -1,12 +1,17 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("i")
+@Implements("Ignore")
 public class class7 {
    @ObfuscatedName("m")
+   @Export("previousName")
    String field126;
    @ObfuscatedName("j")
+   @Export("name")
    String field130;
    @ObfuscatedName("bl")
    static class167 field131;
diff --git a/src/main/java/net/runelite/rs/client/class76.java b/src/main/java/net/runelite/rs/client/class76.java
index fc46ac69df..8696185dae 100644
--- a/src/main/java/net/runelite/rs/client/class76.java
+++ b/src/main/java/net/runelite/rs/client/class76.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -31,6 +32,7 @@ public class class76 {
    @ObfuscatedGetter(
       intValue = -177783653
    )
+   @Export("cameraY")
    static int field1374;
    @ObfuscatedName("dw")
    static byte[][] field1377;
diff --git a/src/main/java/net/runelite/rs/client/class78.java b/src/main/java/net/runelite/rs/client/class78.java
index ffdc9aa2ed..fcb846af20 100644
--- a/src/main/java/net/runelite/rs/client/class78.java
+++ b/src/main/java/net/runelite/rs/client/class78.java
@@ -5,9 +5,11 @@ import java.awt.Image;
 import java.awt.MediaTracker;
 import java.awt.Toolkit;
 import java.awt.image.PixelGrabber;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("cq")
+@Implements("SpritePixels")
 public final class class78 extends class79 {
    @ObfuscatedName("a")
    public int field1388;
diff --git a/src/main/java/net/runelite/rs/client/class8.java b/src/main/java/net/runelite/rs/client/class8.java
index 9447778651..b83473795a 100644
--- a/src/main/java/net/runelite/rs/client/class8.java
+++ b/src/main/java/net/runelite/rs/client/class8.java
@@ -3,6 +3,7 @@ package net.runelite.rs.client;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -17,6 +18,7 @@ public class class8 {
    @ObfuscatedGetter(
       intValue = -1222407947
    )
+   @Export("plane")
    static int field134;
    @ObfuscatedName("l")
    boolean field135;
diff --git a/src/main/java/net/runelite/rs/client/class83.java b/src/main/java/net/runelite/rs/client/class83.java
index 36e19482d3..fdf5969df6 100644
--- a/src/main/java/net/runelite/rs/client/class83.java
+++ b/src/main/java/net/runelite/rs/client/class83.java
@@ -1,5 +1,6 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
@@ -19,6 +20,7 @@ public class class83 {
    @ObfuscatedGetter(
       intValue = 258739071
    )
+   @Export("cameraYaw")
    static int field1434;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
diff --git a/src/main/java/net/runelite/rs/client/class84.java b/src/main/java/net/runelite/rs/client/class84.java
index 21cbb1b7a3..dfce2250f8 100644
--- a/src/main/java/net/runelite/rs/client/class84.java
+++ b/src/main/java/net/runelite/rs/client/class84.java
@@ -1,9 +1,12 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("cm")
+@Implements("Renderable")
 public abstract class class84 extends class203 {
    @ObfuscatedName("qm")
    public static class77 field1440;
@@ -11,6 +14,7 @@ public abstract class class84 extends class203 {
    @ObfuscatedGetter(
       intValue = 1450079013
    )
+   @Export("modelHeight")
    public int field1441 = 1000;
 
    @ObfuscatedName("m")
diff --git a/src/main/java/net/runelite/rs/client/class85.java b/src/main/java/net/runelite/rs/client/class85.java
index e3c635d96b..e0bc27b414 100644
--- a/src/main/java/net/runelite/rs/client/class85.java
+++ b/src/main/java/net/runelite/rs/client/class85.java
@@ -1,8 +1,11 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ch")
+@Implements("Region")
 public class class85 {
    @ObfuscatedName("p")
    static int field1443 = 0;
@@ -21,6 +24,7 @@ public class class85 {
    @ObfuscatedName("i")
    int field1450 = 0;
    @ObfuscatedName("t")
+   @Export("objects")
    class97[] field1451 = new class97[5000];
    @ObfuscatedName("y")
    static int field1452;
@@ -91,6 +95,7 @@ public class class85 {
    @ObfuscatedName("u")
    int[][][] field1491;
    @ObfuscatedName("a")
+   @Export("tiles")
    class100[][][] field1492;
    @ObfuscatedName("aj")
    static final int[] field1493;
diff --git a/src/main/java/net/runelite/rs/client/class97.java b/src/main/java/net/runelite/rs/client/class97.java
index 8a6816f876..b760c2cf2b 100644
--- a/src/main/java/net/runelite/rs/client/class97.java
+++ b/src/main/java/net/runelite/rs/client/class97.java
@@ -1,26 +1,33 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ck")
+@Implements("GameObject")
 public final class class97 {
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1691294757
    )
+   @Export("flags")
    int field1641 = 0;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 919293527
    )
+   @Export("height")
    int field1642;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 1460744763
    )
+   @Export("plane")
    int field1643;
    @ObfuscatedName("a")
+   @Export("renderable")
    public class84 field1644;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
@@ -31,31 +38,37 @@ public final class class97 {
    @ObfuscatedGetter(
       intValue = -1655844155
    )
+   @Export("orientation")
    int field1646;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = -1852021673
    )
+   @Export("relativeX")
    int field1647;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = 1481383257
    )
+   @Export("offsetX")
    int field1648;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 895022087
    )
+   @Export("relativeY")
    int field1649;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = 981018825
    )
+   @Export("offsetY")
    int field1650;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1046625625
    )
+   @Export("y")
    int field1651;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
@@ -66,11 +79,13 @@ public final class class97 {
    @ObfuscatedGetter(
       intValue = -819960345
    )
+   @Export("hash")
    public int field1653 = 0;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 635743121
    )
+   @Export("x")
    int field1654;
    @ObfuscatedName("mu")
    static class78 field1655;
diff --git a/src/main/java/net/runelite/rs/client/class98.java b/src/main/java/net/runelite/rs/client/class98.java
index 111f980b65..b86d647b3b 100644
--- a/src/main/java/net/runelite/rs/client/class98.java
+++ b/src/main/java/net/runelite/rs/client/class98.java
@@ -1,21 +1,27 @@
 package net.runelite.rs.client;
 
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("cn")
+@Implements("ItemLayer")
 public final class class98 {
    @ObfuscatedName("a")
+   @Export("top")
    class84 field1657;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1612412647
    )
+   @Export("x")
    int field1658;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -551432189
    )
+   @Export("y")
    int field1659;
    @ObfuscatedName("ix")
    @ObfuscatedGetter(
@@ -23,25 +29,31 @@ public final class class98 {
    )
    static int field1660;
    @ObfuscatedName("m")
+   @Export("middle")
    class84 field1661;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 298308091
    )
+   @Export("hash")
    int field1662;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = 1607886499
    )
+   @Export("flags")
    int field1663;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -2093829273
    )
+   @Export("height")
    int field1664;
    @ObfuscatedName("u")
+   @Export("bottom")
    class84 field1665;
    @ObfuscatedName("mo")
+   @Export("clanMembers")
    static class24[] field1667;
 
    @ObfuscatedName("bo")
diff --git a/src/main/java/net/runelite/rs/client/client.java b/src/main/java/net/runelite/rs/client/client.java
index 552b11dfd0..9359b567bb 100644
--- a/src/main/java/net/runelite/rs/client/client.java
+++ b/src/main/java/net/runelite/rs/client/client.java
@@ -14,9 +14,12 @@ import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
 import java.net.Socket;
 import java.util.Iterator;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
+@Implements("Client")
 public final class client extends class143 {
    @ObfuscatedName("my")
    @ObfuscatedGetter(
@@ -69,6 +72,8 @@ public final class client extends class143 {
    @ObfuscatedGetter(
       intValue = -61212269
    )
+   //@Export("currentPacketOpcode")
+   //@Export("gameCycle")
    static int field286 = 0;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
@@ -107,8 +112,10 @@ public final class client extends class143 {
    @ObfuscatedGetter(
       intValue = 800135253
    )
+   @Export("gameState")
    static int field296 = 0;
    @ObfuscatedName("if")
+   @Export("menuActions")
    static String[] field297;
    @ObfuscatedName("b")
    @ObfuscatedGetter(
@@ -132,6 +139,7 @@ public final class client extends class143 {
    @ObfuscatedName("ah")
    static class20 field303;
    @ObfuscatedName("ic")
+   @Export("componentTable")
    static class195 field304;
    @ObfuscatedName("gy")
    static int[][] field305;
@@ -171,6 +179,7 @@ public final class client extends class143 {
    )
    static int field312;
    @ObfuscatedName("cb")
+   @Export("cachedNPCs")
    static class34[] field313;
    @ObfuscatedName("cp")
    @ObfuscatedGetter(
@@ -251,6 +260,7 @@ public final class client extends class143 {
    @ObfuscatedName("nk")
    static boolean field334;
    @ObfuscatedName("w")
+   @Export("collisionMaps")
    static class107[] field335;
    @ObfuscatedName("df")
    static boolean field336;
@@ -291,6 +301,7 @@ public final class client extends class143 {
    )
    static int field346;
    @ObfuscatedName("ho")
+   @Export("skillExperiences")
    static int[] field347;
    @ObfuscatedName("ea")
    @ObfuscatedGetter(
@@ -488,6 +499,7 @@ public final class client extends class143 {
    )
    static int field396;
    @ObfuscatedName("gp")
+   @Export("cachedPlayers")
    static class2[] field397;
    @ObfuscatedName("ib")
    @ObfuscatedGetter(
@@ -523,16 +535,20 @@ public final class client extends class143 {
    )
    static int field406;
    @ObfuscatedName("hf")
+   @Export("groundItemDeque")
    static class198[][][] field407;
    @ObfuscatedName("hs")
    static class198 field408;
    @ObfuscatedName("hp")
    static class198 field409;
    @ObfuscatedName("or")
+   @Export("friends")
    static class17[] field410;
    @ObfuscatedName("hk")
+   @Export("boostedSkillLevels")
    static int[] field411;
    @ObfuscatedName("hj")
+   @Export("realSkillLevels")
    static int[] field412;
    @ObfuscatedName("hx")
    @ObfuscatedGetter(
@@ -566,8 +582,10 @@ public final class client extends class143 {
    @ObfuscatedGetter(
       intValue = 1388015669
    )
+   @Export("world")
    static int field421 = 1;
    @ObfuscatedName("ig")
+   @Export("menuOptions")
    static String[] field422;
    @ObfuscatedName("ii")
    @ObfuscatedGetter(
@@ -585,6 +603,7 @@ public final class client extends class143 {
    )
    static int field425;
    @ObfuscatedName("ly")
+   @Export("isResized")
    static boolean field426;
    @ObfuscatedName("od")
    static boolean[] field427;
@@ -601,6 +620,7 @@ public final class client extends class143 {
    @ObfuscatedGetter(
       intValue = -779763173
    )
+   @Export("weight")
    static int field431;
    @ObfuscatedName("ir")
    static String field432;
@@ -635,6 +655,7 @@ public final class client extends class143 {
    @ObfuscatedGetter(
       intValue = -1870477629
    )
+   @Export("energy")
    static int field439;
    @ObfuscatedName("gm")
    static boolean field440;
@@ -656,6 +677,7 @@ public final class client extends class143 {
    )
    static int field444;
    @ObfuscatedName("op")
+   @Export("ignores")
    static class7[] field445;
    @ObfuscatedName("cj")
    @ObfuscatedGetter(
@@ -793,8 +815,10 @@ public final class client extends class143 {
    @ObfuscatedName("lf")
    static boolean[] field481;
    @ObfuscatedName("lx")
+   @Export("widgetPositionX")
    static int[] field482;
    @ObfuscatedName("ll")
+   @Export("widgetPositionY")
    static int[] field483;
    @ObfuscatedName("lb")
    static int[] field484;
@@ -851,6 +875,7 @@ public final class client extends class143 {
    @ObfuscatedName("mb")
    static int[] field498;
    @ObfuscatedName("pe")
+   @Export("grandExchangeOffers")
    static class219[] field499;
    @ObfuscatedName("hm")
    static boolean field500;
@@ -983,16 +1008,19 @@ public final class client extends class143 {
    @ObfuscatedGetter(
       intValue = 1797905553
    )
+   @Export("camera2")
    static int field538;
    @ObfuscatedName("oq")
    @ObfuscatedGetter(
       intValue = 294769919
    )
+   @Export("camera3")
    static int field539;
    @ObfuscatedName("oy")
    @ObfuscatedGetter(
       intValue = 163765829
    )
+   @Export("scale")
    static int field540;
    @ObfuscatedName("oj")
    @ObfuscatedGetter(