From 02f95546cc166c88337adc856d4b08cffcedcf28 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 12 Mar 2016 13:33:48 -0500
Subject: [PATCH] This runs ok through import test

---
 src/main/java/net/runelite/rs/api/Actor.java  |  3 ++
 src/main/java/net/runelite/rs/api/Client.java | 32 ++++++++++++++++---
 src/main/java/net/runelite/rs/api/Ignore.java |  2 +-
 .../net/runelite/rs/api/ItemComposition.java  |  3 ++
 .../net/runelite/rs/api/NPCComposition.java   |  2 +-
 .../runelite/rs/api/PlayerComposition.java    |  6 ++++
 src/main/java/net/runelite/rs/api/Widget.java |  2 +-
 .../java/net/runelite/rs/api/XClanMember.java |  4 +--
 8 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/runelite/rs/api/Actor.java b/src/main/java/net/runelite/rs/api/Actor.java
index bf1ab3fb7a..ce2e813701 100644
--- a/src/main/java/net/runelite/rs/api/Actor.java
+++ b/src/main/java/net/runelite/rs/api/Actor.java
@@ -33,4 +33,7 @@ public interface Actor extends Renderable
 
 	@Import("animation")
 	int getAnimation();
+
+	@Import("hitSplats")
+	int[] getHitSplats();
 }
diff --git a/src/main/java/net/runelite/rs/api/Client.java b/src/main/java/net/runelite/rs/api/Client.java
index 35da9b753c..5b4c4b8111 100644
--- a/src/main/java/net/runelite/rs/api/Client.java
+++ b/src/main/java/net/runelite/rs/api/Client.java
@@ -64,7 +64,7 @@ public interface Client extends GameEngine
 	@Import("realSkillLevels")
 	int[] getRealSkillLevels();
 
-	@Import("skillExperience")
+	@Import("skillExperiences")
 	int[] getSkillExperiences();
 
 	@Import("gameState")
@@ -82,7 +82,7 @@ public interface Client extends GameEngine
 	@Import("cachedNPCs")
 	NPC[] getCachedNPCs();
 
-	@Import("collionMaps")
+	@Import("collisionMaps")
 	CollisionData[] getCollisionMaps();
 
 	@Import("cachedPlayers")
@@ -94,12 +94,24 @@ public interface Client extends GameEngine
 	@Import("username")
 	String getUsername();
 
-	@Import("menuACtions")
+	@Import("menuActions")
 	String[] getMenuActions();
 
+	@Import("menuTargets")
+	String[] getMenuTargets();
+
 	@Import("menuOptions")
 	String[] getMenuOptions();
 
+	@Import("menuOptionCount")
+	int getMenuOptionCount();
+
+	@Import("menuTypes")
+	int[] getMenuTypes();
+
+	@Import("menuIdentifiers")
+	int[] getMenuIdentifiers();
+
 	@Import("friends")
 	Friend[] getFriends();
 
@@ -135,7 +147,7 @@ public interface Client extends GameEngine
 	@Import("validInterfaces")
 	boolean[] getValidInterfaces();
 
-	@Import("resized")
+	@Import("isResized")
 	boolean isResized();
 
 	@Import("widgetPositionX")
@@ -158,4 +170,16 @@ public interface Client extends GameEngine
 
 	@Import("clanMembers")
 	XClanMember[] getClanMembers();
+
+	@Import("isMenuOpen")
+	boolean isMenuOpen();
+
+	@Import("packetOpcode")
+	int getPacketOpcode();
+
+	@Import("gameCycle")
+	int getGameCycle();
+
+	@Import("packetHandler")
+	void packetHandler();
 }
diff --git a/src/main/java/net/runelite/rs/api/Ignore.java b/src/main/java/net/runelite/rs/api/Ignore.java
index 23355186c8..f433c096c8 100644
--- a/src/main/java/net/runelite/rs/api/Ignore.java
+++ b/src/main/java/net/runelite/rs/api/Ignore.java
@@ -7,6 +7,6 @@ public interface Ignore
 	@Import("name")
 	String getName();
 
-	@Import("prevousName")
+	@Import("previousName")
 	String getPreviousName();
 }
diff --git a/src/main/java/net/runelite/rs/api/ItemComposition.java b/src/main/java/net/runelite/rs/api/ItemComposition.java
index 72ce4dedfc..27ae2ee6d0 100644
--- a/src/main/java/net/runelite/rs/api/ItemComposition.java
+++ b/src/main/java/net/runelite/rs/api/ItemComposition.java
@@ -9,4 +9,7 @@ public interface ItemComposition
 
 	@Import("isMembers")
 	boolean isMembers();
+
+	@Import("maleModel")
+	int getMaleModel();
 }
diff --git a/src/main/java/net/runelite/rs/api/NPCComposition.java b/src/main/java/net/runelite/rs/api/NPCComposition.java
index 415e1310d3..7d41ccab19 100644
--- a/src/main/java/net/runelite/rs/api/NPCComposition.java
+++ b/src/main/java/net/runelite/rs/api/NPCComposition.java
@@ -13,7 +13,7 @@ public interface NPCComposition
 	@Import("actions")
 	String[] getActions();
 
-	@Import("clickable")
+	@Import("isClickable")
 	boolean isClickable();
 
 	@Import("isMinimapVisible")
diff --git a/src/main/java/net/runelite/rs/api/PlayerComposition.java b/src/main/java/net/runelite/rs/api/PlayerComposition.java
index 66de626945..77b321011c 100644
--- a/src/main/java/net/runelite/rs/api/PlayerComposition.java
+++ b/src/main/java/net/runelite/rs/api/PlayerComposition.java
@@ -9,4 +9,10 @@ public interface PlayerComposition
 
 	@Import("equipment")
 	int[] getEquipment();
+
+	@Import("bodyPartColours")
+	int[] getBodyPartColours();
+
+	@Import("bodyParts")
+	int[] getBodyParts();
 }
diff --git a/src/main/java/net/runelite/rs/api/Widget.java b/src/main/java/net/runelite/rs/api/Widget.java
index 2360807dda..05824440fc 100644
--- a/src/main/java/net/runelite/rs/api/Widget.java
+++ b/src/main/java/net/runelite/rs/api/Widget.java
@@ -58,7 +58,7 @@ public interface Widget
 	@Import("width")
 	int getWidth();
 
-	@Import("heigth")
+	@Import("height")
 	int getHeight();
 
 	@Import("isHidden")
diff --git a/src/main/java/net/runelite/rs/api/XClanMember.java b/src/main/java/net/runelite/rs/api/XClanMember.java
index 246aca8116..a89e68cf7b 100644
--- a/src/main/java/net/runelite/rs/api/XClanMember.java
+++ b/src/main/java/net/runelite/rs/api/XClanMember.java
@@ -4,8 +4,8 @@ import net.runelite.mapping.Import;
 
 public interface XClanMember
 {
-	@Import("name")
-	String getName();
+	@Import("username")
+	String getUsernameName();
 
 	@Import("world")
 	int getWorld();