Merge pull request #1605 from xKylee/lms

WidgetID: move LMS Widget

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

@@ -154,6 +154,8 @@ public class WidgetID
 	public static final int TRADING_SCREEN = 335;
 	public static final int SEED_VAULT_GROUP_ID = 631;
 	public static final int EXPLORERS_RING_ALCH_GROUP_ID = 483;
+	public static final int LMS_GROUP_ID = 333;
+	public static final int LMS_INGAME_GROUP_ID = 328;
 
 	static class WorldMap
 	{
@@ -1143,4 +1145,13 @@ public class WidgetID
 	{
 		static final int INVENTORY = 7;
 	}
+
+	static class Lms
+	{
+		static final int INFO = 2;
+	}
+	static class LmsKDA
+	{
+		static final int INFO = 4;
+	}
 }

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

@@ -175,6 +175,9 @@ public enum WidgetInfo
 	MINIMAP_WORLDMAP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB),
 	MINIMAP_WORLD_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB),
 
+	LMS_INFO(WidgetID.LMS_GROUP_ID, WidgetID.Lms.INFO),
+	LMS_KDA(WidgetID.LMS_INGAME_GROUP_ID, WidgetID.LmsKDA.INFO),
+
 	LOGIN_CLICK_TO_PLAY_SCREEN(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, 0),
 	LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, WidgetID.LoginClickToPlayScreen.MESSAGE_OF_THE_DAY),
 

runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java

@@ -43,7 +43,6 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.api.util.Text;
-import net.runelite.client.util.WeaponType;
 
 @Singleton
 class PrayAgainstPlayerOverlay extends Overlay

runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java

@@ -41,7 +41,6 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
-import net.runelite.client.util.WeaponType;
 
 @Singleton
 class PrayAgainstPlayerOverlayPrayerTab extends Overlay

runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java

@@ -56,7 +56,6 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.util.ImageUtil;
-import net.runelite.client.util.WeaponType;
 
 @PluginDescriptor(
 	name = "Pray Against Player",

runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java

@@ -22,14 +22,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.runelite.client.util;
+package net.runelite.client.plugins.prayagainstplayer;
 
 import net.runelite.api.Client;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.Player;
 import net.runelite.api.kit.KitType;
 
-public enum WeaponType
+enum WeaponType
 {
 
 	WEAPON_MELEE,
@@ -116,12 +116,7 @@ public enum WeaponType
 		"flail",
 		"granite hammer",
 		"rapier",
-		"bulwark",
+		"bulwark"
-		"ham joint",
-		"blade of saeldor",
-		"swift blade",
-		"wolfbane",
-		"keris"
 	};
 
 	private static final String[] rangedWeaponNames = {
@@ -132,18 +127,14 @@ public enum WeaponType
 		"dart",
 		"thrownaxe",
 		"chinchompa",
-		"ballista",
+		"ballista"
-		"javelin"
 	};
 
 	private static final String[] magicWeaponNames = {
 		"staff",
 		"trident",
 		"wand",
-		"dawnbringer",
+		"dawnbringer"
-		"ivandis",
-		"void knight mace",
-		"sceptre"
 	};
 
 }

runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java

@@ -57,6 +57,8 @@ public class WidgetOverlay extends Overlay
 		.put(WidgetInfo.MULTICOMBAT_FIXED, OverlayPosition.BOTTOM_RIGHT)
 		.put(WidgetInfo.MULTICOMBAT_RESIZEABLE, OverlayPosition.CANVAS_TOP_RIGHT)
 		.put(WidgetInfo.PYRAMID_PLUNDER_DATA, OverlayPosition.TOP_CENTER)
+		.put(WidgetInfo.LMS_INFO, OverlayPosition.TOP_CENTER)
+		.put(WidgetInfo.LMS_KDA, OverlayPosition.TOP_CENTER)
 		.put(WidgetInfo.THEATRE_OF_BLOOD_HEALTH_ORBS, OverlayPosition.TOP_LEFT)
 		.build();