From 3422136e5b734d847e3ae5870c98f4cb607576b5 Mon Sep 17 00:00:00 2001
From: Max Weber <mii7303@gmail.com>
Date: Wed, 18 Aug 2021 12:56:27 -0600
Subject: [PATCH] rl-client/ImageCapture: use RSProfileType for screenshot
 naming

---
 .../net/runelite/client/util/ImageCapture.java | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java b/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java
index 9cfd63174d..81422f259e 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java
@@ -42,7 +42,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Base64;
 import java.util.Date;
-import java.util.EnumSet;
 import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
@@ -52,9 +51,9 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.api.WorldType;
 import net.runelite.client.Notifier;
 import static net.runelite.client.RuneLite.SCREENSHOT_DIR;
+import net.runelite.client.config.RuneScapeProfileType;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.HttpUrl;
@@ -116,20 +115,11 @@ public class ImageCapture
 		File playerFolder;
 		if (client.getLocalPlayer() != null && client.getLocalPlayer().getName() != null)
 		{
-			final EnumSet<WorldType> worldTypes = client.getWorldType();
-
 			String playerDir = client.getLocalPlayer().getName();
-			if (worldTypes.contains(WorldType.DEADMAN))
+			RuneScapeProfileType profileType = RuneScapeProfileType.getCurrent(client);
+			if (profileType != RuneScapeProfileType.STANDARD)
 			{
-				playerDir += "-Deadman";
-			}
-			else if (worldTypes.contains(WorldType.LEAGUE))
-			{
-				playerDir += "-League";
-			}
-			else if (worldTypes.contains(WorldType.TOURNAMENT))
-			{
-				playerDir += "-Tournament";
+				playerDir += "-" + Text.titleCase(profileType);
 			}
 
 			if (!Strings.isNullOrEmpty(subDir))