From c1076a159e681995c0096255867c45be799ab11a Mon Sep 17 00:00:00 2001
From: xKylee <48519776+xKylee@users.noreply.github.com>
Date: Sat, 7 Sep 2019 10:14:36 +0100
Subject: [PATCH] util: move weaponType

util: move weaponType

WeaponType has been moved so it can be utilised by other plugins too. it has also been updated to reflect newer and missing weapons
---
 .../PrayAgainstPlayerOverlay.java             |  1 +
 .../PrayAgainstPlayerOverlayPrayerTab.java    |  1 +
 .../PrayAgainstPlayerPlugin.java              |  1 +
 .../WeaponType.java                           | 19 ++++++++++++++-----
 4 files changed, 17 insertions(+), 5 deletions(-)
 rename runelite-client/src/main/java/net/runelite/client/{plugins/prayagainstplayer => util}/WeaponType.java (93%)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
index 97d8bfe4c6..431a2c8a55 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
@@ -43,6 +43,7 @@ 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
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
index c4380983f3..10da63ec35 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
@@ -41,6 +41,7 @@ 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
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
index 4e3ce27162..fb4518c606 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
@@ -56,6 +56,7 @@ 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",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/util/WeaponType.java
similarity index 93%
rename from runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
rename to runelite-client/src/main/java/net/runelite/client/util/WeaponType.java
index d6078e556e..3c762f1811 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/WeaponType.java
@@ -22,14 +22,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.runelite.client.plugins.prayagainstplayer;
+package net.runelite.client.util;
 
 import net.runelite.api.Client;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.Player;
 import net.runelite.api.kit.KitType;
 
-enum WeaponType
+public enum WeaponType
 {
 
 	WEAPON_MELEE,
@@ -116,7 +116,12 @@ enum WeaponType
 		"flail",
 		"granite hammer",
 		"rapier",
-		"bulwark"
+		"bulwark",
+		"ham joint",
+		"blade of saeldor",
+		"swift blade",
+		"wolfbane",
+		"keris"
 	};
 
 	private static final String[] rangedWeaponNames = {
@@ -127,14 +132,18 @@ enum WeaponType
 		"dart",
 		"thrownaxe",
 		"chinchompa",
-		"ballista"
+		"ballista",
+		"javelin"
 	};
 
 	private static final String[] magicWeaponNames = {
 		"staff",
 		"trident",
 		"wand",
-		"dawnbringer"
+		"dawnbringer",
+		"ivandis",
+		"void knight mace",
+		"sceptre"
 	};
 
 }