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

client: Rebrand (#1688)

Browse Source 
client: Rebrand
This commit is contained in:
ST0NEWALL
2019-10-04 22:49:34 -04:00
committed by GitHub
parent 8553132844 6e61179da8
commit 027a369084
139 changed files with 291 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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/fightcave/WaveOverlay.java
View File

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

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

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

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;

6
runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.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;

2
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
View File

@@ -52,7 +52,7 @@ class WorldTableHeader extends JPanel
private static final ImageIcon HIGHLIGHT_ARROW_UP;
private static final Color ARROW_COLOR = ColorScheme.LIGHT_GRAY_COLOR;
private static final Color HIGHLIGHT_COLOR = ColorScheme.BRAND_ORANGE;
private static final Color HIGHLIGHT_COLOR = ColorScheme.BRAND_BLUE;
static
{

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

@@ -81,7 +81,7 @@ public class ClientLoader
catch (ClassNotFoundException e)
{
RuneLiteSplashScreen.setError("Unable to load client", "Class not found. This means you"
+ " are not running RuneLitePlus with Gradle as the injected client"
+ " are not running OpenOSRS with Gradle as the injected client"
+ " is not in your classpath.");
log.error("Error loading RS!", e);

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

@@ -107,7 +107,7 @@ import org.pushingpixels.substance.internal.utils.SubstanceTitlePaneUtilities;
public class ClientUI
{
private static final String CONFIG_GROUP = "runelite";
private static final String PLUS_CONFIG_GROUP = "runeliteplus";
private static final String PLUS_CONFIG_GROUP = "openosrs";
private static final String CONFIG_CLIENT_BOUNDS = "clientBounds";
private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized";
private static final String CONFIG_OPACITY = "enableOpacity";
@@ -115,7 +115,7 @@ public class ClientUI
private static final int CLIENT_WELL_HIDDEN_MARGIN = 160;
private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10;
public static boolean allowInput = false;
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runeliteplus.png");
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/openosrs.png");
@Getter
private TrayIcon trayIcon;
@@ -536,7 +536,7 @@ public class ClientUI
if (client != null && !(client instanceof Client))
{
SwingUtilities.invokeLater(() -> JOptionPane.showMessageDialog(frame,
"RuneLitePlus has not yet been updated to work with the latest\n"
"OpenOSRS has not yet been updated to work with the latest\n"
+ "game update, it will work with reduced functionality until then.",
"RuneLite is outdated", INFORMATION_MESSAGE));
}

12
runelite-client/src/main/java/net/runelite/client/ui/ColorScheme.java
View File

@@ -31,11 +31,11 @@ import java.awt.Color;
*/
public class ColorScheme
{
/* The orange color used for the branding's accents */
public static final Color BRAND_ORANGE = new Color(220, 138, 0);
/* The blue color used for the branding's accents */
public static final Color BRAND_BLUE = new Color(25, 194, 255);
/* The orange color used for the branding's accents, with lowered opacity */
public static final Color BRAND_ORANGE_TRANSPARENT = new Color(220, 138, 0, 120);
/* The blue color used for the branding's accents, with lowered opacity */
public static final Color BRAND_BLUE_TRANSPARENT = new Color(25, 194, 255, 120);
public static final Color DARKER_GRAY_COLOR = new Color(30, 30, 30);
public static final Color DARK_GRAY_COLOR = new Color(40, 40, 40);
@@ -51,8 +51,8 @@ public class ColorScheme
/* The color for the red progress bar (used in ge offers, farming tracker, etc)*/
public static final Color PROGRESS_ERROR_COLOR = new Color(230, 30, 30);
/* The color for the orange progress bar (used in ge offers, farming tracker, etc)*/
public static final Color PROGRESS_INPROGRESS_COLOR = new Color(230, 150, 30);
/* The color for the blue progress bar (used in ge offers, farming tracker, etc)*/
public static final Color PROGRESS_INPROGRESS_COLOR = new Color(0, 106, 221);
/* The color for the price indicator in the ge search results */
public static final Color GRAND_EXCHANGE_PRICE = new Color(110, 225, 110);

4
runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
View File

@@ -48,12 +48,12 @@ public class RuneLiteSplashScreen extends JFrame
private RuneLiteSplashScreen()
{
this.setTitle("RuneLitePlus");
this.setTitle("OpenOSRS");
this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
this.setSize(FRAME_SIZE);
this.setLayout(new BorderLayout());
this.setUndecorated(true);
this.setIconImage(ImageUtil.getResourceStreamFromClass(RuneLiteSplashScreen.class, "/runeliteplus.png"));
this.setIconImage(ImageUtil.getResourceStreamFromClass(RuneLiteSplashScreen.class, "/openosrs.png"));
final JPanel panel = new JPanel();
panel.setLayout(new BorderLayout());

2
runelite-client/src/main/java/net/runelite/client/ui/components/FlatTextField.java
View File

@@ -67,7 +67,7 @@ public class FlatTextField extends JPanel
this.textField.setBorder(null);
this.textField.setOpaque(false);
this.textField.setSelectedTextColor(Color.WHITE);
this.textField.setSelectionColor(ColorScheme.BRAND_ORANGE_TRANSPARENT);
this.textField.setSelectionColor(ColorScheme.BRAND_BLUE_TRANSPARENT);
add(textField, BorderLayout.CENTER);

20
runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java
View File

@@ -55,11 +55,11 @@ import net.runelite.client.util.LinkBrowser;
public class InfoPanel extends JPanel
{
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 Color DARK_GREY = new Color(10, 10, 10, 255);
private static final BufferedImage TRANSPARENT_LOGO = ImageUtil.getResourceStreamFromClass(InfoPanel.class, "/runeliteplus_transparent.png");
private static final BufferedImage TRANSPARENT_LOGO = ImageUtil.getResourceStreamFromClass(InfoPanel.class, "/openosrs.png");
static final Dimension PANEL_SIZE = new Dimension(200, RuneLiteSplashScreen.FRAME_SIZE.height);
private static final Dimension VERSION_SIZE = new Dimension(PANEL_SIZE.width, 25);
private static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite");
@@ -69,7 +69,7 @@ public class InfoPanel extends JPanel
public InfoPanel()
{
try (InputStream in = getClass().getResourceAsStream("/runelite.plus.properties"))
try (InputStream in = getClass().getResourceAsStream("/open.osrs.properties"))
{
properties.load(in);
}
@@ -104,12 +104,8 @@ public class InfoPanel extends JPanel
c.anchor = GridBagConstraints.SOUTH;
c.weighty = 0;
// Version
this.add(createPanelTextButton("RuneLite Version: " + properties.getProperty(RUNELITE_VERSION)), c);
c.gridy++;
// Plus version
this.add(createPanelTextButton("Plus Version: " + properties.getProperty(RUNELITE_PLUS_VERSION)), c);
// OpenOSRS version
this.add(createPanelTextButton("OpenOSRS Version: " + properties.getProperty(RUNELITE_PLUS_VERSION)), c);
c.gridy++;
// Build date
@@ -120,7 +116,7 @@ public class InfoPanel extends JPanel
this.add(logsFolder, c);
c.gridy++;
final JLabel discord = createPanelButton("Get help on Discord", "Instant invite link to join the RuneLitePlus discord", () -> LinkBrowser.browse(RuneLiteProperties.getDiscordInvite()));
final JLabel discord = createPanelButton("Get help on Discord", "Instant invite link to join the openosrs discord", () -> LinkBrowser.browse(RuneLiteProperties.getDiscordInvite()));
this.add(discord, c);
c.gridy++;
@@ -138,7 +134,7 @@ public class InfoPanel extends JPanel
final JLabel textButton = new JLabel(title);
textButton.setFont(FontManager.getRunescapeSmallFont());
textButton.setHorizontalAlignment(JLabel.CENTER);
textButton.setForeground(ColorScheme.BRAND_ORANGE);
textButton.setForeground(ColorScheme.BRAND_BLUE);
textButton.setBackground(null);
textButton.setPreferredSize(VERSION_SIZE);
textButton.setMinimumSize(VERSION_SIZE);

8
runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java
View File

@@ -50,7 +50,7 @@ public class MessagePanel extends JPanel
private static final Dimension BAR_SIZE = new Dimension(PANEL_SIZE.width, 30);
private static final int MESSAGE_AREA_PADDING = 15;
private final JLabel titleLabel = new JLabel("Welcome to RuneLitePlus");
private final JLabel titleLabel = new JLabel("Welcome to OpenOSRS");
private final JLabel messageArea;
private final JLabel barLabel = new JLabel("Doing something important");
private final JProgressBar bar = new JProgressBar(0, 100);
@@ -80,7 +80,7 @@ public class MessagePanel extends JPanel
c.gridy++;
// alternate message action
messageArea = new JLabel("<html><div style='text-align:center;'>Fork of RuneLite that provides more functionality and less restrictions whilst staying open source.</div></html>")
messageArea = new JLabel("<html><div style='text-align:center;'>Open-source client for Old School RuneScape with more functionality and less restrictions.</div></html>")
{
@Override
public Dimension getPreferredSize()
@@ -118,8 +118,8 @@ public class MessagePanel extends JPanel
this.add(barLabel, c);
c.gridy++;
bar.setBackground(ColorScheme.BRAND_ORANGE_TRANSPARENT.darker());
bar.setForeground(ColorScheme.BRAND_ORANGE);
bar.setBackground(ColorScheme.BRAND_BLUE_TRANSPARENT.darker());
bar.setForeground(ColorScheme.BRAND_BLUE);
bar.setMinimumSize(BAR_SIZE);
bar.setMaximumSize(BAR_SIZE);
bar.setBorder(new MatteBorder(0, 0, 0, 0, Color.LIGHT_GRAY));

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