Merge remote-tracking branch 'upstream/master'

runelite-api/src/main/java/net/runelite/api/kit/KitType.java

@@ -26,6 +26,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.runelite.api.widgets.WidgetInfo;
 
 /**
  * Represents an equipment slot in a players composition.
@@ -39,24 +40,26 @@
 @AllArgsConstructor
 public enum KitType
 {
-	HELMET("Helmet", 0),
-	CAPE("Cape", 1),
-	AMULET("Amulet", 2),
-	WEAPON("Weapon", 3),
-	TORSO("Torso", 4),
-	SHIELD("Shield", 5),
-	LEGS("Legs", 7),
-	HEAD("Head", 8),
-	HANDS("Hands", 9),
-	BOOTS("Boots", 10),
-	JAW("Jaw", 11),
-	RING("Ring", 12),
-	AMMUNITION("Ammo", 13);
+	HELMET("Helmet", 0, WidgetInfo.EQUIPMENT_HELMET),
+	CAPE("Cape", 1, WidgetInfo.EQUIPMENT_CAPE),
+	AMULET("Amulet", 2, WidgetInfo.EQUIPMENT_AMULET),
+	WEAPON("Weapon", 3, WidgetInfo.EQUIPMENT_WEAPON),
+	TORSO("Torso", 4, WidgetInfo.EQUIPMENT_BODY),
+	SHIELD("Shield", 5, WidgetInfo.EQUIPMENT_SHIELD),
+	LEGS("Legs", 7, WidgetInfo.EQUIPMENT_LEGS),
+	HEAD("Head", 8, null),
+	HANDS("Hands", 9, WidgetInfo.EQUIPMENT_GLOVES),
+	BOOTS("Boots", 10, WidgetInfo.EQUIPMENT_BOOTS),
+	JAW("Jaw", 11, null),
+	RING("Ring", 12, WidgetInfo.EQUIPMENT_RING),
+	AMMUNITION("Ammo", 13, WidgetInfo.EQUIPMENT_AMMO);
 
 	private final String name;
 
 	/**
 	 * Gets the raw equipment index for use in {PlayerAppearance#getEquipmentIds()}.
 	 */
 	private final int index;
-}
+
+	private final WidgetInfo widgetInfo;
+}

runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java

@@ -315,6 +315,17 @@ static class GuidePrices
 
 	static class Equipment
 	{
+		static final int HELMET = 14;
+		static final int CAPE = 15;
+		static final int AMULET = 16;
+		static final int WEAPON = 17;
+		static final int BODY = 18;
+		static final int SHIELD = 19;
+		static final int LEGS = 20;
+		static final int GLOVES = 21;
+		static final int BOOTS = 22;
+		static final int RING = 23;
+		static final int AMMO = 24;
 		static final int INVENTORY_ITEM_CONTAINER = 0;
 	}
 
@@ -1202,4 +1213,4 @@ static class Skills
 	{
 		static final int CONTAINER = 0;
 	}
-}
+}

runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java

@@ -63,6 +63,18 @@ public enum WidgetInfo
 	EQUIPMENT(WidgetID.EQUIPMENT_GROUP_ID, 0),
 	EQUIPMENT_INVENTORY_ITEMS_CONTAINER(WidgetID.EQUIPMENT_INVENTORY_GROUP_ID, WidgetID.Equipment.INVENTORY_ITEM_CONTAINER),
 
+	EQUIPMENT_HELMET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.HELMET),
+	EQUIPMENT_CAPE(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.CAPE),
+	EQUIPMENT_AMULET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMULET),
+	EQUIPMENT_WEAPON(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.WEAPON),
+	EQUIPMENT_BODY(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.BODY),
+	EQUIPMENT_SHIELD(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.SHIELD),
+	EQUIPMENT_LEGS(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.LEGS),
+	EQUIPMENT_GLOVES(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.GLOVES),
+	EQUIPMENT_BOOTS(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.BOOTS),
+	EQUIPMENT_RING(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.RING),
+	EQUIPMENT_AMMO(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMMO),
+
 	EMOTE_WINDOW(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_WINDOW),
 	EMOTE_CONTAINER(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_CONTAINER),
 	EMOTE_SCROLLBAR(WidgetID.EMOTES_GROUP_ID, WidgetID.Emotes.EMOTE_SCROLLBAR),
@@ -860,4 +872,4 @@ public static int PACK(int groupId, int childId)
 		return groupId << 16 | childId;
 	}
 
-}
+}

runelite-client/src/main/java/net/runelite/client/database/GenerateClasses.java

@@ -26,7 +26,7 @@ public static void main(String... args)
 					)
 					.withTarget(new Target()
 						.withPackageName("net.runelite.client.database.data")
-						.withDirectory("runelite-client/src/main/java/net/runelite/client/database/data")
+						.withDirectory("runelite-client/src/main/java/")
 					)
 				);