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

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

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

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",

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"
 	};
 
 }