From b7e7395a11e6353452eadceb28f93e8de5ad692b Mon Sep 17 00:00:00 2001
From: Scott Burns <sd.burns1998@gmail.com>
Date: Thu, 16 May 2019 01:14:58 +0200
Subject: [PATCH] Refactor RL+

---
 .../runeliteplus/RuneLitePlusConfig.java      | 17 +++++----
 .../runeliteplus/RuneLitePlusPlugin.java      | 35 ++++++++++++-------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
index f91f594fd3..dbdeea12d0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
@@ -33,13 +33,16 @@ import net.runelite.client.config.ConfigItem;
 @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(
+		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",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
index 89aa7a73b7..f7f0505f86 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.runeliteplus;
 
 
 import com.google.inject.Provides;
+import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.RuneLiteProperties;
@@ -39,8 +40,6 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.ClientUI;
 
-import javax.inject.Inject;
-
 @PluginDescriptor(
 	loadWhenOutdated = true, // prevent users from disabling
 	hidden = true, // prevent users from disabling
@@ -67,7 +66,7 @@ public class RuneLitePlusPlugin extends Plugin
 
 
 	@Provides
-    RuneLitePlusConfig getConfig(ConfigManager configManager)
+	RuneLitePlusConfig getConfig(ConfigManager configManager)
 	{
 		return configManager.getConfig(RuneLitePlusConfig.class);
 	}
@@ -75,16 +74,20 @@ public class RuneLitePlusPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		if (getConfig(configManager).customPresence()) {
+		if (getConfig(configManager).customPresence())
+		{
 			ClientUI.currentPresenceName = ("RuneLitePlus");
 			ClientUI.frame.setTitle(ClientUI.currentPresenceName);
 		}
 
-		if (config.customPresence()) {
+		if (config.customPresence())
+		{
 			RuneLiteProperties.discordAppID = rlPlusDiscordApp;
 			discordService.close();
 			discordService.init();
-		} else {
+		}
+		else
+		{
 			RuneLiteProperties.discordAppID = rlDiscordApp;
 			discordService.close();
 			discordService.init();
@@ -92,21 +95,29 @@ public class RuneLitePlusPlugin extends Plugin
 	}
 
 	@Subscribe
-	protected void onConfigChanged(ConfigChanged event) {
-		if (event.getKey().equals("customPresence")) {
-			if (config.customPresence()) {
+	protected void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getKey().equals("customPresence"))
+		{
+			if (config.customPresence())
+			{
 				ClientUI.currentPresenceName = ("RuneLitePlus");
 				ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-			} else {
+			}
+			else
+			{
 				ClientUI.currentPresenceName = ("RuneLite");
 				ClientUI.frame.setTitle(ClientUI.currentPresenceName);
 			}
 
-			if (config.customPresence()) {
+			if (config.customPresence())
+			{
 				RuneLiteProperties.discordAppID = rlPlusDiscordApp;
 				discordService.close();
 				discordService.init();
-			} else {
+			}
+			else
+			{
 				RuneLiteProperties.discordAppID = rlDiscordApp;
 				discordService.close();
 				discordService.init();