From 33c98d1e2e286da45576fed533d60e936583c0c0 Mon Sep 17 00:00:00 2001
From: melkypie <5113962+melkypie@users.noreply.github.com>
Date: Sun, 3 May 2020 00:47:06 +0300
Subject: [PATCH] client: move FishingSpot to net.runelite.client.game

---
 .../client/{plugins/fishing => game}/FishingSpot.java       | 6 +++---
 .../net/runelite/client/plugins/fishing/FishingPlugin.java  | 1 +
 .../client/plugins/fishing/FishingSpotMinimapOverlay.java   | 1 +
 .../runelite/client/plugins/fishing/FishingSpotOverlay.java | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename runelite-client/src/main/java/net/runelite/client/{plugins/fishing => game}/FishingSpot.java (98%)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java
similarity index 98%
rename from runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
rename to runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java
index ed91ff29a2..b116d71495 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/FishingSpot.java
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.client.plugins.fishing;
+package net.runelite.client.game;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
@@ -105,7 +105,7 @@ import static net.runelite.api.NpcID.FISHING_SPOT_4928;
 import static net.runelite.api.NpcID.FISHING_SPOT_6784;
 
 @Getter
-enum FishingSpot
+public enum FishingSpot
 {
 	SHRIMP("Shrimp, Anchovies", ItemID.RAW_SHRIMPS,
 		FISHING_SPOT_1514, FISHING_SPOT_1518, FISHING_SPOT_1521,
@@ -202,7 +202,7 @@ enum FishingSpot
 		this.ids = ids;
 	}
 
-	static FishingSpot findSpot(int id)
+	public static FishingSpot findSpot(int id)
 	{
 		return SPOTS.get(id);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
index 27a7bd3f32..8c424f4618 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
@@ -66,6 +66,7 @@ import net.runelite.client.Notifier;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.events.OverlayMenuClicked;
+import net.runelite.client.game.FishingSpot;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDependency;
 import net.runelite.client.plugins.PluginDescriptor;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
index aa9e72cdf6..7b995a9945 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
@@ -32,6 +32,7 @@ import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.api.GraphicID;
 import net.runelite.api.NPC;
+import net.runelite.client.game.FishingSpot;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
index c7200b9201..82c710a214 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
@@ -41,6 +41,7 @@ import net.runelite.api.Perspective;
 import net.runelite.api.Point;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.client.game.FishingSpot;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;