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

Merge remote-tracking branch 'upstream/openosrs_branding' into openosrs_branding

Browse Source
This commit is contained in:
Owain van Brakel
2019-10-03 05:14:16 +02:00
parent 126cb7fcda 00f6cbf39e
commit 3eb6156ca4
112 changed files with 202 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/FUNDING.yml vendored
View File

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

12
README.md
View File

@@ -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

14
http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
View File

@@ -62,8 +62,8 @@ 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";
private static final String OPENOSRS_SESSION = "https://session.openosrs.com";
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 =
@@ -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;
rlpUserAgent = "openosrs/" + version + "-" + rlpCommit + (dirty ? "+" : "");
rlUserAgent = "openosrs/" + version;
rsVersion = Integer.parseInt(properties.getProperty("rs.version"));
parseMavenVersion();
@@ -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()

10
http-service-plus/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
View File

@@ -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()
{

6
http-service-plus/src/main/resources/application.yaml
View File

@@ -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,

2
runelite-api/src/main/java/net/runelite/api/events/ProjectileSpawned.java
View File

@@ -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

2
runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java
View File

@@ -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

6
runelite-client/build.gradle
View File

@@ -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()
])
}
}

2
runelite-client/src/main/java/net/runelite/client/Notifier.java
View File

@@ -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);
}

2
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -273,7 +273,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();

6
runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
View File

@@ -40,7 +40,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;
@@ -117,9 +117,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

10
runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
View File

@@ -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);
}

6
runelite-client/src/main/java/net/runelite/client/SessionClient.java
View File

@@ -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();

2
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -71,7 +71,7 @@ import org.apache.commons.lang3.StringUtils;
@Slf4j
public class ConfigManager
{
private static final String SETTINGS_FILE_NAME = "runeliteplus.properties";
private static final String SETTINGS_FILE_NAME = "openosrs.properties";
private static final String STANDARD_SETTINGS_FILE_NAME = "settings.properties";
private static final File SETTINGS_FILE = new File(RuneLite.RUNELITE_DIR, SETTINGS_FILE_NAME);
private static final File STANDARD_SETTINGS_FILE = new File(RuneLite.RUNELITE_DIR, STANDARD_SETTINGS_FILE_NAME);

4
runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java → runelite-client/src/main/java/net/runelite/client/config/openosrsConfig.java
View File

@@ -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",

2
runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java
View File

@@ -17,7 +17,7 @@ import org.jooq.impl.DSL;
@Slf4j
public class DatabaseManager
{
private static final String DB_URL = "jdbc:h2:" + RUNELITE_DIR + File.separator + "RunelitePlus;AUTO_SERVER=TRUE";
private static final String DB_URL = "jdbc:h2:" + RUNELITE_DIR + File.separator + "openosrs;AUTO_SERVER=TRUE";
// Database credentials
private static final String USER = "RLP";

2
runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java
View File

@@ -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.

6
runelite-client/src/main/java/net/runelite/client/game/WorldLocation.java
View File

@@ -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;

12
runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java
View File

@@ -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;

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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<>();
@@ -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,7 +578,7 @@ public class ConfigPanel extends PluginPanel
topPanelBackButton.setToolTipText("Back");
topPanel.add(topPanelBackButton, BorderLayout.WEST);
if (!listItem.getName().equals("RuneLitePlus"))
if (!listItem.getName().equals("openosrs"))
{
topPanel.add(listItem.createToggleButton(), BorderLayout.EAST);
}

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

@@ -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");

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

@@ -199,7 +199,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);
}

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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.
*

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

@@ -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);

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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
* *****************************************************************************
*/

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

@@ -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.
*

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

@@ -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.
*

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

@@ -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.
*

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

@@ -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.
*

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

@@ -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.
*

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

@@ -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.
*

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

@@ -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.
*

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

@@ -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.
*

16
runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java → runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
View File

@@ -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;
@@ -38,7 +38,7 @@ import net.runelite.api.widgets.WidgetID;
import static net.runelite.api.widgets.WidgetInfo.*;
import net.runelite.client.callback.ClientThread;
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 +49,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;
@@ -113,7 +113,7 @@ public class RuneLitePlusPlugin extends Plugin
private void onConfigChanged(ConfigChanged event)
{
if (!event.getGroup().equals("runeliteplus"))
if (!event.getGroup().equals("openosrs"))
{
return;
}
@@ -214,7 +214,7 @@ public class RuneLitePlusPlugin extends Plugin
}
}
private class RuneLitePlusKeyListener implements KeyListener
private class openosrsKeyListener implements KeyListener
{
private int lastKeyCycle;

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

@@ -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;

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

@@ -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;

2
runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoConfig.java
View File

@@ -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

2
runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java
View File

@@ -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

2
runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java
View File

@@ -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

2
runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterConfig.java
View File

@@ -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

2
runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
View File

@@ -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

2
runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java
View File

@@ -76,7 +76,7 @@ class ProfilesPanel extends PluginPanel
private static final String PASSWORD_LABEL = "Account Password";
private static final String HELP = "To add and load accounts, first enter a password into the Encryption Password " +
"field then press %s. <br /><br /> You can now add as many accounts as you would like. <br /><br /> The next time you restart " +
"RunelitePlus, enter your encryption password and click load accounts to see the accounts you entered.";
"openosrs, enter your encryption password and click load accounts to see the accounts you entered.";
@Inject
@Nullable

2
runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java
View File

@@ -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

6
runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
View File

@@ -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
* *****************************************************************************
*/

6
runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
View File

@@ -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
* *****************************************************************************
*/

2
runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersConfig.java
View File

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

2
runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java
View File

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

2
runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
View File

@@ -505,7 +505,7 @@ public class SpellbookPlugin extends Plugin
// Runs magic_spellbook_rebuild
// The magic numbers probably are mobile specific widgetids
// runeliteplus mobile when?
// openosrs mobile when?
clientThread.invoke(() ->
client.runScript(
MAGIC_SPELLBOOK_REDRAW,

2
runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java
View File

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

2
runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
View File

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

2
runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
View File

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

2
runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
View File

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

6
runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
View File

@@ -1,12 +1,12 @@
/*
* ******************************************************************************
* * 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
* *****************************************************************************
*/

6
runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java
View File

@@ -1,12 +1,12 @@
/*
* ******************************************************************************
* * 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
* *****************************************************************************
*/

6
runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsConfig.java
View File

@@ -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.wildernesslocations;

6
runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java
View File

@@ -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.wildernesslocations;

Some files were not shown because too many files have changed in this diff Show More