From 398a2546412f1d5dbeb846aa09083184be2ba033 Mon Sep 17 00:00:00 2001
From: zeruth <TheRealNull@gmail.com>
Date: Thu, 6 Jun 2019 21:43:30 -0400
Subject: [PATCH] Enforce our presence

If you don't like it, you can start to.
---
 .../runeliteplus/RuneLitePlusConfig.java      | 19 ++-----
 .../runeliteplus/RuneLitePlusPlugin.java      | 53 +++----------------
 2 files changed, 11 insertions(+), 61 deletions(-)

diff --git a/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java b/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
index 8eda3a582e..f88417ccad 100644
--- a/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
+++ b/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
@@ -34,22 +34,11 @@ import net.runelite.client.config.Range;
 @ConfigGroup("runeliteplus")
 public interface RuneLitePlusConfig extends Config
 {
-	@ConfigItem(
-		position = 0,
-		keyName = "customPresence",
-		name = "RL+ Presence",
-		description = "Represent RL+ with a custom icon and discord presence."
-	)
-	default boolean customPresence()
-	{
-		return false;
-	}
-
 	@ConfigItem(
 		keyName = "enableOpacity",
 		name = "Enable opacity",
 		description = "Enables opacity for the whole window.<br>NOTE: This only stays enabled if your pc supports this!",
-		position = 1
+		position = 0
 	)
 	default boolean enableOpacity()
 	{
@@ -64,7 +53,7 @@ public interface RuneLitePlusConfig extends Config
 		keyName = "opacityPercentage",
 		name = "Opacity percentage",
 		description = "Changes the opacity of the window if opacity is enabled",
-		position = 2
+		position = 1
 	)
 	default int opacityPercentage()
 	{
@@ -75,7 +64,7 @@ public interface RuneLitePlusConfig extends Config
 		keyName = "keyboardPin",
 		name = "Keyboard bank pin",
 		description = "Enables you to type your bank pin",
-		position = 3
+		position = 2
 	)
 	default boolean keyboardPin()
 	{
@@ -86,7 +75,7 @@ public interface RuneLitePlusConfig extends Config
 			keyName = "logOpt",
 			name = "Send logs",
 			description = "Send logs to help us analyze errors",
-			position = 4
+			position = 3
 	)
 	default boolean logOpt()
 	{
diff --git a/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
index 3d372aa796..a0bfee6350 100644
--- a/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
+++ b/RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
@@ -160,32 +160,19 @@ public class RuneLitePlusPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		ClientUI.currentPresenceName = ("RuneLitePlus");
+		ClientUI.frame.setTitle(ClientUI.currentPresenceName);
+		RuneLiteProperties.discordAppID = rlPlusDiscordApp;
+		discordService.close();
+		discordService.init();
+
 		entered = -1;
 		enterIdx = 0;
 
-		if (getConfig(configManager).customPresence())
-		{
-			ClientUI.currentPresenceName = ("RuneLitePlus");
-			ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-		}
-
 		if (config.logOpt())
 		{
 			Sentry.init("https://f0ed76be2fe847f8b9eb3620fa55d729@sentry.io/1468399?stacktrace.app.packages=net.runelite.client");
 		}
-
-		if (config.customPresence())
-		{
-			RuneLiteProperties.discordAppID = rlPlusDiscordApp;
-			discordService.close();
-			discordService.init();
-		}
-		else
-		{
-			RuneLiteProperties.discordAppID = rlDiscordApp;
-			discordService.close();
-			discordService.init();
-		}
 	}
 
 	@Subscribe
@@ -196,33 +183,7 @@ public class RuneLitePlusPlugin extends Plugin
 			return;
 		}
 
-		if (event.getKey().equals("customPresence"))
-		{
-			if (config.customPresence())
-			{
-				ClientUI.currentPresenceName = ("RuneLitePlus");
-				ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-			}
-			else
-			{
-				ClientUI.currentPresenceName = ("RuneLite");
-				ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-			}
-
-			if (config.customPresence())
-			{
-				RuneLiteProperties.discordAppID = rlPlusDiscordApp;
-				discordService.close();
-				discordService.init();
-			}
-			else
-			{
-				RuneLiteProperties.discordAppID = rlDiscordApp;
-				discordService.close();
-				discordService.init();
-			}
-		}
-		else if (!config.keyboardPin())
+		if (!config.keyboardPin())
 		{
 			entered = -1;
 			enterIdx = 0;