From 38b2492c25d5ca0712da5f287f3efcdde0c45176 Mon Sep 17 00:00:00 2001
From: xKylee <48519776+xKylee@users.noreply.github.com>
Date: Sat, 7 Sep 2019 11:57:44 +0100
Subject: [PATCH] Revert "util: move weaponType"

This reverts commit c1076a159e681995c0096255867c45be799ab11a.
---
 .../PrayAgainstPlayerOverlay.java             |  1 -
 .../PrayAgainstPlayerOverlayPrayerTab.java    |  1 -
 .../PrayAgainstPlayerPlugin.java              |  1 -
 .../prayagainstplayer}/WeaponType.java        | 19 +++++--------------
 4 files changed, 5 insertions(+), 17 deletions(-)
 rename runelite-client/src/main/java/net/runelite/client/{util => plugins/prayagainstplayer}/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 431a2c8a55..97d8bfe4c6 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,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
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 10da63ec35..c4380983f3 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,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
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 fb4518c606..4e3ce27162 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,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",
diff --git a/runelite-client/src/main/java/net/runelite/client/util/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
similarity index 93%
rename from runelite-client/src/main/java/net/runelite/client/util/WeaponType.java
rename to runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
index 3c762f1811..d6078e556e 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/WeaponType.java
+++ b/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",
-		"ham joint",
-		"blade of saeldor",
-		"swift blade",
-		"wolfbane",
-		"keris"
+		"bulwark"
 	};
 
 	private static final String[] rangedWeaponNames = {
@@ -132,18 +127,14 @@ public enum WeaponType
 		"dart",
 		"thrownaxe",
 		"chinchompa",
-		"ballista",
-		"javelin"
+		"ballista"
 	};
 
 	private static final String[] magicWeaponNames = {
 		"staff",
 		"trident",
 		"wand",
-		"dawnbringer",
-		"ivandis",
-		"void knight mace",
-		"sceptre"
+		"dawnbringer"
 	};
 
 }