ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

rl-client/ImageCapture: use RSProfileType for screenshot naming

Browse Source
This commit is contained in:
Max Weber
2021-08-18 12:56:27 -06:00
committed by Adam
parent 9ea0f9f9e5
commit 3422136e5b
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java
View File

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