client: Rebrand (#1688)

client: Rebrand

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-patreon: RuneLitePlus
+patreon: openosrs

README.md

@@ -2,10 +2,10 @@
 
 
 
-# RuneLitePlus 
-[![Build Status](https://github.com/runelite-extended/runelite/workflows/RunelitePlus%20-%20CI/badge.svg)](https://github.com/runelite-extended/runelite/actions)
+# OpenOSRS 
+[![Build Status](https://github.com/runelite-extended/runelite/workflows/openosrs%20-%20CI/badge.svg)](https://github.com/runelite-extended/runelite/actions)
 [![HitCount](http://hits.dwyl.io/runelite-extended/runelite.svg)](http://hits.dwyl.io/runelite-extended/runelite)  
-[RuneLitePlus](https://runelitepl.us)  is an extended version of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying more open-source. We are not affiliated with RuneLite.
+[OpenOSRS](https://openosrs.com)  is an extended version of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying more open-source. We are not affiliated with RuneLite.
 
 ## Discord
 [![Discord](https://img.shields.io/discord/373382904769675265.svg)](https://discord.gg/HN5gf3m)
@@ -14,9 +14,9 @@
 
 - [cache](cache/src/main/java/net/runelite/cache) - Libraries used for reading/writing cache files, as well as the data in it
 - [deobfuscator](deobfuscator/src/main/java/net/runelite/deob) - Can decompile and cleanup gamepacks as well as map updates to newer revs
-- [http-api](http-api/src/main/java/net/runelite/http/api) - API for runelite and runeliteplus
+- [http-api](http-api/src/main/java/net/runelite/http/api) - API for runelite and OpenOSRS
 - [http-service](http-service/src/main/java/net/runelite/http/service) - Service for https://api.runelite.net
-- [http-service-plus](http-service-plus/src/main/java/net/runelite/http/service) - Service for https://api.runelitepl.us
+- [http-service-plus](http-service-plus/src/main/java/net/runelite/http/service) - Service for https://api.openosrs.com
 - [injector-plugin](injector-plugin/src/main/java/net/runelite/injector) - Tool for implementing our modifications to the gamepack
 - [runelite-api](runelite-api/src/main/java/net/runelite/api) - RuneLite API, interfaces for accessing the client
 - [runelite-mixins](runelite-mixins/src/main/java/net/runelite) - Classes containing the Objects to be injected using the injector-plugin
@@ -49,7 +49,7 @@ Disable Default World plugin if you have it enabled, this causes issues with cod
 ```  
 ## License
 
-RuneLitePlus is licensed under the BSD 2-clause license. See the license header in the respective file to be sure.
+OpenOSRS is licensed under the BSD 2-clause license. See the license header in the respective file to be sure.
 
 ## Contribute and Develop
 

http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java

@@ -62,15 +62,15 @@ public class RuneLiteAPI
 	public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 	private static final Logger logger = LoggerFactory.getLogger(RuneLiteAPI.class);
 	private static final String BASE = "https://api.runelite.net";
-	private static final String RLPLUS_BASE = "https://api.runelitepl.us";
-	private static final String RLPLUS_SESSION = "https://session.runelitepl.us";
+	private static final String OPENOSRS_BASE = /*"https://api.openosrs.com*/ "https://api.runelitepl.us";
+	private static final String OPENOSRS_SESSION = /*"https://session.openosrs.com"*/ "https://session.runelitepl.us";
 	private static final String WSBASE = "https://api.runelite.net/ws";
 	private static final String STATICBASE = "https://static.runelite.net";
 	private static final String MAVEN_METADATA =
 		"http://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml";
 	private static final Properties properties = new Properties();
 	private static String rlUserAgent;
-	private static String rlpUserAgent;
+	private static String openosrsUserAgent;
 
 	static
 	{
@@ -83,8 +83,8 @@ public class RuneLiteAPI
 			String rlpCommit = properties.getProperty("runelite.commit");
 			boolean dirty = Boolean.parseBoolean(properties.getProperty("runelite.dirty"));
 
-			rlpUserAgent = "RuneLitePlus/" + version + "-" + rlpCommit + (dirty ? "+" : "");
-			rlUserAgent = "RuneLitePlus/" + version;
+			openosrsUserAgent = "openosrs/" + version + "-" + rlpCommit + (dirty ? "+" : "");
+			rlUserAgent = "openosrs/" + version;
 			rsVersion = Integer.parseInt(properties.getProperty("rs.version"));
 
 			parseMavenVersion();
@@ -128,7 +128,7 @@ public class RuneLiteAPI
 				{
 					Request userAgentRequest = chain.request()
 						.newBuilder()
-						.header("User-Agent", rlpUserAgent)
+						.header("User-Agent", openosrsUserAgent)
 						.build();
 					return chain.proceed(userAgentRequest);
 				}
@@ -136,9 +136,9 @@ public class RuneLiteAPI
 			.build();
 	}
 
-	public static HttpUrl getRuneLitePlusSessionBase()
+	public static HttpUrl getopenosrsSessionBase()
 	{
-		return HttpUrl.parse(RLPLUS_SESSION);
+		return HttpUrl.parse(OPENOSRS_SESSION);
 	}
 
 	public static HttpUrl getApiBase()
@@ -155,7 +155,7 @@ public class RuneLiteAPI
 
 	public static HttpUrl getPlusApiBase()
 	{
-		return HttpUrl.parse(RLPLUS_BASE + "/http-service-" + getRlpVersion());
+		return HttpUrl.parse(OPENOSRS_BASE + "/http-service-" + getRlpVersion());
 	}
 
 	public static HttpUrl getStaticBase()
@@ -206,7 +206,7 @@ public class RuneLiteAPI
 			byte[] chunk = new byte[4096];
 			int bytesRead;
 			URLConnection conn = toDownload.openConnection();
-			conn.setRequestProperty("User-Agent", rlpUserAgent);
+			conn.setRequestProperty("User-Agent", openosrsUserAgent);
 			stream = conn.getInputStream();
 
 			while ((bytesRead = stream.read(chunk)) > 0)

http-service-openosrs/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'war'
 
-description = 'Web Service Plus'
+description = 'Web Service OpenOSRS'
 
 dependencies {
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok

http-service-openosrs/src/main/java/net/runelite/http/service/SpringBootWebApplication.java

@@ -70,7 +70,7 @@ public class SpringBootWebApplication extends SpringBootServletInitializer
 			@Override
 			public void contextInitialized(ServletContextEvent sce)
 			{
-				log.info("RuneLitePlus API started");
+				log.info("OpenOSRS API started");
 			}
 
 			@Override
@@ -93,27 +93,27 @@ public class SpringBootWebApplication extends SpringBootServletInitializer
 					log.warn(null, ex);
 				}
 
-				log.info("RuneLitePlus API stopped");
+				log.info("OpenOSRS API stopped");
 			}
 
 		};
 	}
 
-	@ConfigurationProperties(prefix = "datasource.runeliteplus")
+	@ConfigurationProperties(prefix = "datasource.openosrs")
 	@Bean("dataSourceRuneLite")
 	public DataSourceProperties dataSourceProperties()
 	{
 		return new DataSourceProperties();
 	}
 
-	@ConfigurationProperties(prefix = "datasource.runeliteplus-cache")
+	@ConfigurationProperties(prefix = "datasource.openosrs-cache")
 	@Bean("dataSourceRuneLiteCache")
 	public DataSourceProperties dataSourcePropertiesCache()
 	{
 		return new DataSourceProperties();
 	}
 
-	@ConfigurationProperties(prefix = "datasource.runeliteplus-tracker")
+	@ConfigurationProperties(prefix = "datasource.openosrs-tracker")
 	@Bean("dataSourceRuneLiteTracker")
 	public DataSourceProperties dataSourcePropertiesTracker()
 	{

http-service-openosrs/src/main/resources/application.yaml

@@ -1,9 +1,9 @@
 datasource:
-  runeliteplus:
+  openosrs:
     jndiName: java:comp/env/jdbc/runelite
-  runeliteplus-cache:
+  openosrs-cache:
     jndiName: java:comp/env/jdbc/runelite-cache2
-  runeliteplus-tracker:
+  openosrs-tracker:
     jndiName: java:comp/env/jdbc/runelite-tracker
 
 # By default Spring tries to register the datasource as an MXBean,

runelite-api/src/main/java/net/runelite/api/events/ProjectileSpawned.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/build.gradle

@@ -80,12 +80,12 @@ static def getDate() {
 def buildDate = getDate()
 
 processResources {
-    from file("src/main/resources/runelite.plus.properties"), {
+    from file("src/main/resources/open.osrs.properties"), {
         filter(ReplaceTokens, tokens: [
                 "project.version": project.version,
                 "rs.version": rsversion.toString(),
-                "runelite.plus.version": plusVersion.toString(),
-                "runelite.plus.builddate": buildDate.toString()
+                "open.osrs.version": plusVersion.toString(),
+                "open.osrs.builddate": buildDate.toString()
         ])
     }
 }

runelite-client/src/main/java/net/runelite/client/Notifier.java

@@ -325,7 +325,7 @@ public class Notifier
 	{
 		if (OSType.getOSType() == OSType.Linux && !Files.exists(notifyIconPath))
 		{
-			try (InputStream stream = Notifier.class.getResourceAsStream("/runeliteplus.png"))
+			try (InputStream stream = Notifier.class.getResourceAsStream("/openosrs.png"))
 			{
 				Files.copy(stream, notifyIconPath);
 			}

runelite-client/src/main/java/net/runelite/client/RuneLite.java

@@ -282,7 +282,7 @@ public class RuneLite
 			RuneLiteSplashScreen.setError("Error while loading!", "Please check your internet connection and your DNS settings.");
 		});
 
-		RuneLiteSplashScreen.stage(0, "Starting RuneLitePlus injector");
+		RuneLiteSplashScreen.stage(0, "Starting OpenOSRS injector");
 
 		final long start = System.currentTimeMillis();
 

runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java

@@ -41,7 +41,7 @@ import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ChatColorConfig;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.config.RuneLiteConfig;
-import net.runelite.client.config.RuneLitePlusConfig;
+import net.runelite.client.config.OpenOSRSConfig;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.menus.MenuManager;
@@ -123,9 +123,9 @@ public class RuneLiteModule extends AbstractModule
 
 	@Provides
 	@Singleton
-	RuneLitePlusConfig providePlusConfig(ConfigManager configManager)
+	OpenOSRSConfig providePlusConfig(ConfigManager configManager)
 	{
-		return configManager.getConfig(RuneLitePlusConfig.class);
+		return configManager.getConfig(OpenOSRSConfig.class);
 	}
 
 	@Provides

runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java

@@ -32,12 +32,12 @@ import java.util.Properties;
 @Singleton
 public class RuneLiteProperties
 {
-	private static final String RUNELITE_TITLE = "runelite.plus.title";
+	private static final String RUNELITE_TITLE = "open.osrs.title";
 	private static final String RUNELITE_VERSION = "runelite.version";
-	private static final String RUNELITE_PLUS_VERSION = "runelite.plus.version";
-	private static final String RUNELITE_PLUS_DATE = "runelite.plus.builddate";
+	private static final String RUNELITE_PLUS_VERSION = "open.osrs.version";
+	private static final String RUNELITE_PLUS_DATE = "open.osrs.builddate";
 	private static final String RUNESCAPE_VERSION = "runescape.version";
-	private static final String DISCORD_APP_ID = "runelite.plus.discord.appid";
+	private static final String DISCORD_APP_ID = "open.osrs.discord.appid";
 	private static final String DISCORD_INVITE = "runelite.discord.invite";
 	private static final String GITHUB_LINK = "runelite.github.link";
 	private static final String WIKI_LINK = "runelite.wiki.link";
@@ -51,7 +51,7 @@ public class RuneLiteProperties
 
 	static
 	{
-		try (InputStream in = RuneLiteProperties.class.getResourceAsStream("/runelite.plus.properties"))
+		try (InputStream in = RuneLiteProperties.class.getResourceAsStream("/open.osrs.properties"))
 		{
 			properties.load(in);
 		}

runelite-client/src/main/java/net/runelite/client/SessionClient.java

@@ -39,7 +39,7 @@ class SessionClient
 {
 	UUID open() throws IOException
 	{
-		HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder()
+		HttpUrl url = RuneLiteAPI.getopenosrsSessionBase().newBuilder()
 			.build();
 
 		Request request = new Request.Builder()
@@ -61,7 +61,7 @@ class SessionClient
 
 	void ping(UUID uuid) throws IOException
 	{
-		HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder()
+		HttpUrl url = RuneLiteAPI.getopenosrsSessionBase().newBuilder()
 			.addPathSegment("ping")
 			.addQueryParameter("session", uuid.toString())
 			.build();
@@ -81,7 +81,7 @@ class SessionClient
 
 	void delete(UUID uuid) throws IOException
 	{
-		HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder()
+		HttpUrl url = RuneLiteAPI.getopenosrsSessionBase().newBuilder()
 			.addQueryParameter("session", uuid.toString())
 			.build();
 

runelite-client/src/main/java/net/runelite/client/config/OpenOSRSConfig.java

@@ -26,8 +26,8 @@
  */
 package net.runelite.client.config;
 
-@ConfigGroup("runeliteplus")
-public interface RuneLitePlusConfig extends Config
+@ConfigGroup("openosrs")
+public interface OpenOSRSConfig extends Config
 {
 	@ConfigItem(
 		keyName = "enableOpacity",

runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java

@@ -26,7 +26,7 @@
  */
 
 /*
-Modified java.awt.Robot for use with RuneLitePlus. Hopefully we can make it stand far apart.
+Modified java.awt.Robot for use with openosrs. Hopefully we can make it stand far apart.
 Uses
 https://github.com/JoonasVali/NaturalMouseMotion
 for mouse motion.

runelite-client/src/main/java/net/runelite/client/game/WorldLocation.java

@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2019 RuneLitePlus
+ * Copyright (c) 2019 openosrs
  * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file.
  * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors:
  * ST0NEWALL#9112
- * RuneLitePlus Discord: https://discord.gg/Q7wFtCe
- * RuneLitePlus website: https://runelitepl.us
+ * openosrs Discord: https://discord.gg/Q7wFtCe
+ * openosrs website: https://openosrs.com
  ******************************************************************************/
 
 package net.runelite.client.game;

runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java

@@ -46,7 +46,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.client.RuneLite;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigManager;
-import net.runelite.client.config.RuneLitePlusConfig;
+import net.runelite.client.config.OpenOSRSConfig;
 
 @Singleton
 @Slf4j
@@ -54,7 +54,7 @@ public class PluginWatcher extends Thread
 {
 	private static final File BASE = RuneLite.PLUGIN_DIR;
 
-	private final RuneLitePlusConfig runelitePlusConfig;
+	private final OpenOSRSConfig OpenOSRSConfig;
 	private final PluginManager pluginManager;
 	private final WatchService watchService;
 	private final WatchKey watchKey;
@@ -63,9 +63,9 @@ public class PluginWatcher extends Thread
 	private ConfigManager configManager;
 
 	@Inject
-	public PluginWatcher(RuneLitePlusConfig runelitePlusConfig, PluginManager pluginManager) throws IOException
+	public PluginWatcher(OpenOSRSConfig OpenOSRSConfig, PluginManager pluginManager) throws IOException
 	{
-		this.runelitePlusConfig = runelitePlusConfig;
+		this.OpenOSRSConfig = OpenOSRSConfig;
 		this.pluginManager = pluginManager;
 
 		setName("Plugin Watcher");
@@ -85,7 +85,7 @@ public class PluginWatcher extends Thread
 	@Override
 	public void run()
 	{
-		if (runelitePlusConfig.enablePlugins())
+		if (OpenOSRSConfig.enablePlugins())
 		{
 			scan();
 		}
@@ -97,7 +97,7 @@ public class PluginWatcher extends Thread
 				WatchKey key = watchService.take();
 				Thread.sleep(50);
 
-				if (!runelitePlusConfig.enablePlugins())
+				if (!OpenOSRSConfig.enablePlugins())
 				{
 					key.reset();
 					continue;

runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2018, Jacob M <https://github.com/jacoblairm>
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2018, Cameron <https://github.com/noremac201>
  * Copyright (c) 2018, Jacob M <https://github.com/jacoblairm>
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/DeathTimesMode.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2018, Cameron <https://github.com/noremac201>
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018, Jacob M <https://github.com/jacoblairm>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2018, Jacob M <https://github.com/jacoblairm>
  * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
- * Copyright (c) 2019, https://runelitepl.us
+ * Copyright (c) 2019, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java

@@ -101,7 +101,7 @@ import net.runelite.client.config.Keybind;
 import net.runelite.client.config.ModifierlessKeybind;
 import net.runelite.client.config.Range;
 import net.runelite.client.config.RuneLiteConfig;
-import net.runelite.client.config.RuneLitePlusConfig;
+import net.runelite.client.config.OpenOSRSConfig;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginInstantiationException;
@@ -139,13 +139,13 @@ public class ConfigPanel extends PluginPanel
 	private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value();
 	private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins";
 	private static final String RUNELITE_PLUGIN = "RuneLite";
-	private static final String RUNELITEPLUS_PLUGIN = "RuneLitePlus";
+	private static final String openosrs_PLUGIN = "OpenOSRS";
 	private static final String CHAT_COLOR_PLUGIN = "Chat Color";
 	private final PluginManager pluginManager;
 	private final ConfigManager configManager;
 	private final ScheduledExecutorService executorService;
 	private final RuneLiteConfig runeLiteConfig;
-	private final RuneLitePlusConfig runeLitePlusConfig;
+	private final OpenOSRSConfig OpenOSRSConfig;
 	private final ChatColorConfig chatColorConfig;
 	private final ColorPickerManager colorPickerManager;
 	public static List<PluginListItem> pluginList = new ArrayList<>();
@@ -164,7 +164,7 @@ public class ConfigPanel extends PluginPanel
 		BACK_ICON = new ImageIcon(backIcon);
 		BACK_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(backIcon, -100));
 
-		final BufferedImage orangeBackIcon = ImageUtil.fillImage(backIcon, ColorScheme.BRAND_ORANGE);
+		final BufferedImage orangeBackIcon = ImageUtil.fillImage(backIcon, ColorScheme.BRAND_BLUE);
 
 		final BufferedImage sectionRetractIcon = ImageUtil.rotateImage(orangeBackIcon, Math.PI * 1.5);
 		SECTION_RETRACT_ICON = new ImageIcon(sectionRetractIcon);
@@ -176,7 +176,7 @@ public class ConfigPanel extends PluginPanel
 	}
 
 	ConfigPanel(PluginManager pluginManager, ConfigManager configManager, ScheduledExecutorService executorService,
-				RuneLiteConfig runeLiteConfig, RuneLitePlusConfig runeLitePlusConfig, ChatColorConfig chatColorConfig,
+				RuneLiteConfig runeLiteConfig, OpenOSRSConfig OpenOSRSConfig, ChatColorConfig chatColorConfig,
 				ColorPickerManager colorPickerManager)
 	{
 		super(false);
@@ -184,7 +184,7 @@ public class ConfigPanel extends PluginPanel
 		this.configManager = configManager;
 		this.executorService = executorService;
 		this.runeLiteConfig = runeLiteConfig;
-		this.runeLitePlusConfig = runeLitePlusConfig;
+		this.OpenOSRSConfig = OpenOSRSConfig;
 		this.chatColorConfig = chatColorConfig;
 		this.colorPickerManager = colorPickerManager;
 
@@ -289,13 +289,13 @@ public class ConfigPanel extends PluginPanel
 		runeLite.nameLabel.setForeground(Color.WHITE);
 		pluginList.add(runeLite);
 
-		// set RuneLitePlus config on top, as it should always have been
-		final PluginListItem runeLitePlus = new PluginListItem(this, configManager, runeLitePlusConfig,
-			configManager.getConfigDescriptor(runeLitePlusConfig),
-			RUNELITEPLUS_PLUGIN, "RuneLitePlus client settings", "client");
-		runeLitePlus.setPinned(pinnedPlugins.contains(RUNELITEPLUS_PLUGIN));
-		runeLitePlus.nameLabel.setForeground(Color.WHITE);
-		pluginList.add(runeLitePlus);
+		// set OpenOSRS config on top, as it should always have been
+		final PluginListItem openosrs = new PluginListItem(this, configManager, OpenOSRSConfig,
+			configManager.getConfigDescriptor(OpenOSRSConfig),
+			openosrs_PLUGIN, "OpenOSRS client settings", "client");
+		openosrs.setPinned(pinnedPlugins.contains(openosrs_PLUGIN));
+		openosrs.nameLabel.setForeground(Color.WHITE);
+		pluginList.add(openosrs);
 
 		List<PluginListItem> externalPlugins = new ArrayList<>();
 		// populate pluginList with all external Plugins
@@ -578,11 +578,6 @@ public class ConfigPanel extends PluginPanel
 		topPanelBackButton.setToolTipText("Back");
 		topPanel.add(topPanelBackButton, BorderLayout.WEST);
 
-		if (!listItem.getName().equals("RuneLitePlus"))
-		{
-			topPanel.add(listItem.createToggleButton(), BorderLayout.EAST);
-		}
-
 		String name = listItem.getName();
 		JLabel title = new JLabel(name);
 		title.setForeground(Color.WHITE);
@@ -607,7 +602,7 @@ public class ConfigPanel extends PluginPanel
 
 			JLabel headerLabel = new JLabel(cs.name());
 			headerLabel.setFont(FontManager.getRunescapeFont());
-			headerLabel.setForeground(ColorScheme.BRAND_ORANGE);
+			headerLabel.setForeground(ColorScheme.BRAND_BLUE);
 			if (!description.equals(""))
 			{
 				headerLabel.setToolTipText("<html>" + name + ":<br>" + description + "</html>");
@@ -679,7 +674,7 @@ public class ConfigPanel extends PluginPanel
 
 			JLabel configEntryName = new JLabel(cs.name());
 			configEntryName.setPreferredSize(new Dimension(PANEL_WIDTH, (int) configEntryName.getPreferredSize().getHeight()));
-			configEntryName.setForeground(ColorScheme.BRAND_ORANGE);
+			configEntryName.setForeground(ColorScheme.BRAND_BLUE);
 			item.add(configEntryName, BorderLayout.NORTH);
 
 			final JPanel sectionContents = new JPanel();

runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java

@@ -36,7 +36,7 @@ import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ChatColorConfig;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.config.RuneLiteConfig;
-import net.runelite.client.config.RuneLitePlusConfig;
+import net.runelite.client.config.OpenOSRSConfig;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.events.OverlayMenuClicked;
 import net.runelite.client.events.PluginChanged;
@@ -76,7 +76,7 @@ public class ConfigPlugin extends Plugin
 	private RuneLiteConfig runeLiteConfig;
 
 	@Inject
-	private RuneLitePlusConfig runeLitePlusConfig;
+	private OpenOSRSConfig OpenOSRSConfig;
 
 	@Inject
 	private ChatColorConfig chatColorConfig;
@@ -95,7 +95,7 @@ public class ConfigPlugin extends Plugin
 	{
 		addSubscriptions();
 
-		configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, runeLitePlusConfig, chatColorConfig, colorPickerManager);
+		configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, OpenOSRSConfig, chatColorConfig, colorPickerManager);
 
 		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "config_icon.png");
 

runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java

@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.config;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.image.BufferedImage;
@@ -98,8 +99,8 @@ public class PluginListItem extends JPanel
 		BufferedImage onSwitcher = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "switcher_on.png");
 		BufferedImage onStar = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "star_on.png");
 		CONFIG_ICON = new ImageIcon(configIcon);
-		ON_SWITCHER = new ImageIcon(onSwitcher);
-		ON_STAR = new ImageIcon(onStar);
+		ON_SWITCHER = new ImageIcon(ImageUtil.recolorImage(onSwitcher, new Color(0, 106, 221)));
+		ON_STAR = new ImageIcon(ImageUtil.recolorImage(onStar, new Color(0, 106, 221)));
 		CONFIG_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(configIcon, -100));
 		BufferedImage offSwitcherImage = ImageUtil.flipImage(
 			ImageUtil.grayscaleOffset(
@@ -199,7 +200,7 @@ public class PluginListItem extends JPanel
 		toggleButton.setPreferredSize(new Dimension(25, 0));
 		attachToggleButtonListener(toggleButton);
 
-		if (name.equals("RuneLitePlus"))
+		if (name.equals("OpenOSRS"))
 		{
 			toggleButton.setVisible(false);
 		}

runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java

@@ -44,7 +44,7 @@ import net.runelite.client.ui.overlay.components.table.TableComponent;
 @Singleton
 class WaveOverlay extends Overlay
 {
-	private static final Color HEADER_COLOR = ColorScheme.BRAND_ORANGE;
+	private static final Color HEADER_COLOR = ColorScheme.BRAND_BLUE;
 
 	private final FightCaveConfig config;
 	private final FightCavePlugin plugin;

runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2019, Kyle <https://github.com/kyleeld>
  * Copyright (c) 2018, Raiever <https://github.com/Raieverr>
  * All rights reserved.

runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2019, Kyle <https://github.com/kyleeld>
  * Copyright (c) 2018, Raiever <https://github.com/Raieverr>
  * All rights reserved.

runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PrayerTabStates.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2019, Kyle <https://github.com/kyleeld>
  * Copyright (c) 2018, Raiever <https://github.com/Raieverr>
  * All rights reserved.

runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019, Kyleeld <https://github.com/kyleeld>
- * Copyright (c) 2019, RuneLitePlus <https://runelitepl.us>
+ * Copyright (c) 2019, openosrs <https://openosrs.com>
  *
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java

@@ -113,7 +113,7 @@ public class InfoPanel extends PluginPanel
 		JLabel version = new JLabel(htmlLabel("RuneLite version: ", RuneLiteProperties.getVersion()));
 		version.setFont(smallFont);
 
-		JLabel plusVersion = new JLabel(htmlLabel("RuneLitePlus version: ", RuneLiteProperties.getPlusVersion()));
+		JLabel plusVersion = new JLabel(htmlLabel("OpenOSRS version: ", RuneLiteProperties.getPlusVersion()));
 		plusVersion.setFont(smallFont);
 
 		JLabel revision = new JLabel();
@@ -168,7 +168,7 @@ public class InfoPanel extends PluginPanel
 		actionsContainer.add(buildLinkPanel(GITHUB_ICON, "License info", "for distribution", "https://github.com/runelite-extended/runelite/blob/master/LICENSE"));
 		actionsContainer.add(buildLinkPanel(FOLDER_ICON, "Open logs directory", "(for bug reports)", LOGS_DIR));
 		actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "discord server", "https://discord.gg/HN5gf3m"));
-		actionsContainer.add(buildLinkPanel(PATREON_ICON, "Patreon to support", "the RuneLitePlus devs", RuneLiteProperties.getPatreonLink()));
+		actionsContainer.add(buildLinkPanel(PATREON_ICON, "Patreon to support", "the OpenOSRS devs", RuneLiteProperties.getPatreonLink()));
 		/*		actionsContainer.add(buildLinkPanel(WIKI_ICON, "Information about", "RuneLite and plugins", runeLiteProperties.getWikiLink()));*/
 
 		add(versionPanel, BorderLayout.NORTH);

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupConfig.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018-2019, Ethan <https://github.com/Wea1thRS/>
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
- * Copyright (c) 2018, https://github.com/runeliteplusplus
+ * Copyright (c) 2018, https://openosrs.com
+ * Copyright (c) 2018, https://github.com/openosrsplus
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java

@@ -1,11 +1,11 @@
 /*
  * ******************************************************************************
- *  * Copyright (c) 2019 RuneLitePlus
+ *  * Copyright (c) 2019 openosrs
  *  *  Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file.
  *  *  If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors:
  *  *  ST0NEWALL#9112
- *  *   RuneLitePlus Discord: https://discord.gg/Q7wFtCe
- *  *   RuneLitePlus website: https://runelitepl.us
+ *  *   openosrs Discord: https://discord.gg/Q7wFtCe
+ *  *   openosrs website: https://openosrs.com
  *  *****************************************************************************
  */
 

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/BurningAmuletMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/CombatBraceletMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/DigsitePendantMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/NecklaceOfPassageMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/RingOfWealthMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SkillsNecklaceMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SlayerRingMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/XericsTalismanMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2018, https://openosrs.com
  * Copyright (c) 2018, Kyle <https://github.com/kyleeld>
  * All rights reserved.
  *

runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java

@@ -24,7 +24,7 @@
  *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-package net.runelite.client.plugins.runeliteplus;
+package net.runelite.client.plugins.openosrs;
 
 import java.awt.event.KeyEvent;
 import javax.inject.Inject;
@@ -37,8 +37,9 @@ import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.api.widgets.WidgetID;
 import static net.runelite.api.widgets.WidgetInfo.*;
 import net.runelite.client.callback.ClientThread;
+import net.runelite.client.config.ConfigManager;
 import net.runelite.client.config.Keybind;
-import net.runelite.client.config.RuneLitePlusConfig;
+import net.runelite.client.config.OpenOSRSConfig;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.KeyManager;
@@ -49,15 +50,15 @@ import net.runelite.client.util.HotkeyListener;
 @PluginDescriptor(
 	loadWhenOutdated = true, // prevent users from disabling
 	hidden = true, // prevent users from disabling
-	name = "RunelitePlus"
+	name = "OpenOSRS"
 )
 @Singleton
 @Slf4j
-public class RuneLitePlusPlugin extends Plugin
+public class OpenOSRSPlugin extends Plugin
 {
-	private final RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener();
+	private final openosrsKeyListener keyListener = new openosrsKeyListener();
 	@Inject
-	private RuneLitePlusConfig config;
+	private OpenOSRSConfig config;
 
 	@Inject
 	private KeyManager keyManager;
@@ -71,6 +72,9 @@ public class RuneLitePlusPlugin extends Plugin
 	@Inject
 	private EventBus eventbus;
 
+	@Inject
+	private ConfigManager configManager;
+
 	private HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind)
 	{
 		@Override
@@ -90,6 +94,7 @@ public class RuneLitePlusPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		migrateConfigs();
 		addSubscriptions();
 
 		entered = -1;
@@ -113,7 +118,7 @@ public class RuneLitePlusPlugin extends Plugin
 
 	private void onConfigChanged(ConfigChanged event)
 	{
-		if (!event.getGroup().equals("runeliteplus"))
+		if (!event.getGroup().equals("openosrs"))
 		{
 			return;
 		}
@@ -214,7 +219,7 @@ public class RuneLitePlusPlugin extends Plugin
 		}
 	}
 
-	private class RuneLitePlusKeyListener implements KeyListener
+	private class openosrsKeyListener implements KeyListener
 	{
 		private int lastKeyCycle;
 
@@ -248,4 +253,36 @@ public class RuneLitePlusPlugin extends Plugin
 		{
 		}
 	}
+
+	/**
+	 * Migrates configs from runenergy and regenmeter to this plugin and deletes the old config values.
+	 * This method should be removed after a reasonable amount of time.
+	 */
+	@Deprecated
+	private void migrateConfigs()
+	{
+		migrateConfig("runeliteplus", "enableOpacity");
+		migrateConfig("runeliteplus", "opacityPercentage");
+		migrateConfig("runeliteplus", "keyboardPin");
+		migrateConfig("runeliteplus", "enablePlugins");
+		migrateConfig("runeliteplus", "detachHotkey");
+	}
+
+	/**
+	 * Wrapper for migrating individual config options
+	 * This method should be removed after a reasonable amount of time.
+	 *
+	 * @param group old group name
+	 * @param key   key name to migrate
+	 */
+	@Deprecated
+	private void migrateConfig(String group, String key)
+	{
+		String value = configManager.getConfiguration(group, key);
+		if (value != null)
+		{
+			configManager.setConfiguration("openosrs", key, value);
+			configManager.unsetConfiguration(group, key);
+		}
+	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicationLocation.java

@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2019 RuneLitePlus
+ * Copyright (c) 2019 openosrs
  * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file.
  * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors:
  * ST0NEWALL#9112
- * RuneLitePlus Discord: https://discord.gg/Q7wFtCe
- * RuneLitePlus website: https://runelitepl.us
+ * openosrs Discord: https://discord.gg/Q7wFtCe
+ * openosrs website: https://openosrs.com
  ******************************************************************************/
 
 package net.runelite.client.plugins.playerindicators;

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerRelation.java

@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2019 RuneLitePlus
+ * Copyright (c) 2019 openosrs
  * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file.
  * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors:
  * ST0NEWALL#9112
- * RuneLitePlus Discord: https://discord.gg/Q7wFtCe
- * RuneLitePlus website: https://runelitepl.us
+ * openosrs Discord: https://discord.gg/Q7wFtCe
+ * openosrs website: https://openosrs.com
  ******************************************************************************/
 
 package net.runelite.client.plugins.playerindicators;