From 00f6cbf39e39de00506e6a25f16a17501644968b Mon Sep 17 00:00:00 2001 From: f0rmatme Date: Sun, 29 Sep 2019 17:29:53 -0700 Subject: [PATCH] OPENOSRS branding --- .github/FUNDING.yml | 2 +- .github/workflows/auto-approve.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/checkstyle.yml | 2 +- .github/workflows/gradle_wrapper.yml | 2 +- .github/workflows/scraper.yml | 2 +- .github/workflows/test.yml | 2 +- README.md | 12 ++++---- .../net/runelite/http/api/RuneLiteAPI.java | 14 +++++----- .../service/SpringBootWebApplication.java | 10 +++---- .../src/main/resources/application.yaml | 6 ++-- .../api/events/ProjectileSpawned.java | 2 +- .../runelite/api/events/WidgetPressed.java | 2 +- runelite-client/build.gradle | 6 ++-- .../java/net/runelite/client/Notifier.java | 2 +- .../java/net/runelite/client/RuneLite.java | 2 +- .../net/runelite/client/RuneLiteModule.java | 6 ++-- .../runelite/client/RuneLiteProperties.java | 10 +++---- .../net/runelite/client/SessionClient.java | 6 ++-- .../runelite/client/config/ConfigManager.java | 2 +- ...itePlusConfig.java => openosrsConfig.java} | 4 +-- .../client/database/DatabaseManager.java | 2 +- .../java/net/runelite/client/flexo/Flexo.java | 2 +- .../runelite/client/game/WorldLocation.java | 6 ++-- .../client/plugins/PluginWatcher.java | 12 ++++---- .../plugins/antidrag/AntiDragOverlay.java | 2 +- .../barbarianassault/AboveSceneOverlay.java | 2 +- .../barbarianassault/AboveWidgetsOverlay.java | 2 +- .../BarbarianAssaultConfig.java | 2 +- .../BarbarianAssaultMenu.java | 2 +- .../BarbarianAssaultPlugin.java | 2 +- .../barbarianassault/DeathTimesMode.java | 2 +- .../plugins/barbarianassault/Healer.java | 2 +- .../plugins/barbarianassault/Menus.java | 2 +- .../client/plugins/barbarianassault/Role.java | 2 +- .../plugins/barbarianassault/Scorecard.java | 2 +- .../plugins/barbarianassault/Timer.java | 2 +- .../plugins/barbarianassault/TimerBox.java | 2 +- .../client/plugins/barbarianassault/Wave.java | 2 +- .../client/plugins/config/ConfigPanel.java | 26 +++++++++--------- .../client/plugins/config/ConfigPlugin.java | 6 ++-- .../client/plugins/config/PluginListItem.java | 2 +- .../EquipmentInspectorConfig.java | 2 +- .../EquipmentInspectorPanel.java | 2 +- .../EquipmentInspectorPlugin.java | 2 +- .../plugins/equipmentinspector/ItemPanel.java | 2 +- .../grotesqueguardians/DuskAttack.java | 2 +- .../GrotesqueGuardiansPrayerOverlay.java | 2 +- .../hideprayers/HidePrayersConfig.java | 2 +- .../hideprayers/HidePrayersPlugin.java | 2 +- .../hideprayers/util/PrayerTabStates.java | 2 +- .../client/plugins/hydra/BabyHydraConfig.java | 2 +- .../hydra/BabyHydraIndicatorOverlay.java | 2 +- .../plugins/hydra/BabyHydraOverlay.java | 2 +- .../client/plugins/hydra/BabyHydraPlugin.java | 2 +- .../plugins/hydra/BabyHydraPrayOverlay.java | 2 +- .../plugins/inferno/InfernoWaveMappings.java | 2 +- .../client/plugins/info/InfoPanel.java | 4 +-- .../inventorysetups/InventorySetup.java | 2 +- .../InventorySetupBankOverlay.java | 2 +- .../inventorysetups/InventorySetupConfig.java | 2 +- .../inventorysetups/InventorySetupItem.java | 2 +- .../inventorysetups/InventorySetupPlugin.java | 2 +- .../ui/InventorySetupContainerPanel.java | 2 +- .../ui/InventorySetupEquipmentPanel.java | 2 +- .../ui/InventorySetupInventoryPanel.java | 2 +- .../ui/InventorySetupPluginPanel.java | 2 +- .../ui/InventorySetupSlot.java | 2 +- .../itemcharges/ItemRecoilOverlay.java | 4 +-- .../learntoclick/LearnToClickConfig.java | 2 +- .../LizardmenShamanConfig.java | 2 +- .../LizardmenShamanPlugin.java | 2 +- .../lizardmenshaman/LizardmenShamanSpawn.java | 2 +- .../lizardmenshaman/ShamanSpawnOverlay.java | 2 +- .../loottracker/LootRecordDateFilter.java | 6 ++-- .../util/BurningAmuletMode.java | 2 +- .../util/CombatBraceletMode.java | 2 +- .../util/DigsitePendantMode.java | 2 +- .../util/NecklaceOfPassageMode.java | 2 +- .../util/RingOfWealthMode.java | 2 +- .../util/SkillsNecklaceMode.java | 2 +- .../menuentryswapper/util/SlayerRingMode.java | 2 +- .../util/XericsTalismanMode.java | 2 +- .../OpenOSRSPlugin.java} | 16 +++++------ .../PlayerIndicationLocation.java | 6 ++-- .../playerindicators/PlayerRelation.java | 6 ++-- .../plugins/playerinfo/PlayerInfoConfig.java | 2 +- .../playerinfo/PlayerInfoCustomIndicator.java | 2 +- .../plugins/playerinfo/PlayerInfoPlugin.java | 2 +- .../pluginsorter/PluginSorterConfig.java | 2 +- .../pluginsorter/PluginSorterPlugin.java | 2 +- .../plugins/profiles/ProfilesPanel.java | 2 +- .../client/plugins/pvptools/AttackMode.java | 2 +- .../plugins/pvptools/PlayerCountOverlay.java | 6 ++-- .../plugins/pvptools/PvpToolsPlugin.java | 6 ++-- .../plugins/reminders/RemindersConfig.java | 2 +- .../plugins/reminders/RemindersPlugin.java | 2 +- .../plugins/spellbook/SpellbookPlugin.java | 2 +- .../plugins/vorkath/AcidPathOverlay.java | 2 +- .../client/plugins/vorkath/Vorkath.java | 2 +- .../plugins/vorkath/VorkathOverlay.java | 2 +- .../client/plugins/vorkath/VorkathPlugin.java | 2 +- .../whalewatchers/WhaleWatchersPlugin.java | 6 ++-- .../WhaleWatchersProtOverlay.java | 6 ++-- .../WildernessLocationsConfig.java | 6 ++-- .../WildernessLocationsMapOverlay.java | 6 ++-- .../WildernessLocationsPlugin.java | 6 ++-- .../net/runelite/client/rs/ClientLoader.java | 2 +- .../java/net/runelite/client/ui/ClientUI.java | 6 ++-- .../client/ui/RuneLiteSplashScreen.java | 4 +-- .../client/ui/components/InfoPanel.java | 10 +++---- .../client/ui/components/MessagePanel.java | 2 +- .../net/runelite/client/util/SwingUtil.java | 4 +-- ...e.plus.properties => open.osrs.properties} | 12 ++++---- .../{runeliteplus.png => openosrs.png} | Bin ...ansparent.png => openosrs_transparent.png} | Bin .../ChatNotificationsPluginTest.java | 4 +-- .../net/runelite/rs/api/RSMenuAction.java | 2 +- 118 files changed, 208 insertions(+), 208 deletions(-) rename runelite-client/src/main/java/net/runelite/client/config/{RuneLitePlusConfig.java => openosrsConfig.java} (97%) rename runelite-client/src/main/java/net/runelite/client/plugins/{runeliteplus/RuneLitePlusPlugin.java => openosrs/OpenOSRSPlugin.java} (94%) rename runelite-client/src/main/resources/{runelite.plus.properties => open.osrs.properties} (62%) rename runelite-client/src/main/resources/{runeliteplus.png => openosrs.png} (100%) rename runelite-client/src/main/resources/{runeliteplus_transparent.png => openosrs_transparent.png} (100%) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 0c53255148..819886b2f1 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms -patreon: RuneLitePlus +patreon: openosrs diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index b85578e594..6a7fde6ec1 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -1,4 +1,4 @@ -name: RunelitePlus - Auto approve +name: openosrs - Auto approve on: pull_request diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de841f14b6..bcd54ea3a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: RunelitePlus - CI +name: openosrs - CI on: [pull_request, push] diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 47663761fc..9e230452ee 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -1,4 +1,4 @@ -name: RunelitePlus - Code convention +name: openosrs - Code convention on: [pull_request, push] diff --git a/.github/workflows/gradle_wrapper.yml b/.github/workflows/gradle_wrapper.yml index 13ded2bcd3..a2e06e067c 100644 --- a/.github/workflows/gradle_wrapper.yml +++ b/.github/workflows/gradle_wrapper.yml @@ -1,4 +1,4 @@ -name: RunelitePlus - Gradle Wrapper +name: openosrs - Gradle Wrapper on: schedule: diff --git a/.github/workflows/scraper.yml b/.github/workflows/scraper.yml index 1aabc781db..7f1108288c 100644 --- a/.github/workflows/scraper.yml +++ b/.github/workflows/scraper.yml @@ -1,4 +1,4 @@ -name: RunelitePlus - Scraper +name: openosrs - Scraper on: schedule: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6a8f9ddaf..761c108db7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: RunelitePlus - Testing +name: openosrs - Testing on: [pull_request, push] diff --git a/README.md b/README.md index c92785656e..57ff919d26 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ -# RuneLitePlus -[![Build Status](https://github.com/runelite-extended/runelite/workflows/RunelitePlus%20-%20CI/badge.svg)](https://github.com/runelite-extended/runelite/actions) +# openosrs +[![Build Status](https://github.com/runelite-extended/runelite/workflows/openosrs%20-%20CI/badge.svg)](https://github.com/runelite-extended/runelite/actions) [![HitCount](http://hits.dwyl.io/runelite-extended/runelite.svg)](http://hits.dwyl.io/runelite-extended/runelite) -[RuneLitePlus](https://runelitepl.us) is an extended version of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying more open-source. We are not affiliated with RuneLite. +[openosrs](https://openosrs.com) is an extended version of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying more open-source. We are not affiliated with RuneLite. ## Discord [![Discord](https://img.shields.io/discord/373382904769675265.svg)](https://discord.gg/HN5gf3m) @@ -14,9 +14,9 @@ - [cache](cache/src/main/java/net/runelite/cache) - Libraries used for reading/writing cache files, as well as the data in it - [deobfuscator](deobfuscator/src/main/java/net/runelite/deob) - Can decompile and cleanup gamepacks as well as map updates to newer revs -- [http-api](http-api/src/main/java/net/runelite/http/api) - API for runelite and runeliteplus +- [http-api](http-api/src/main/java/net/runelite/http/api) - API for runelite and openosrs - [http-service](http-service/src/main/java/net/runelite/http/service) - Service for https://api.runelite.net -- [http-service-plus](http-service-plus/src/main/java/net/runelite/http/service) - Service for https://api.runelitepl.us +- [http-service-plus](http-service-plus/src/main/java/net/runelite/http/service) - Service for https://api.openosrs.com - [injector-plugin](injector-plugin/src/main/java/net/runelite/injector) - Tool for implementing our modifications to the gamepack - [runelite-api](runelite-api/src/main/java/net/runelite/api) - RuneLite API, interfaces for accessing the client - [runelite-mixins](runelite-mixins/src/main/java/net/runelite) - Classes containing the Objects to be injected using the injector-plugin @@ -49,7 +49,7 @@ Disable Default World plugin if you have it enabled, this causes issues with cod ``` ## License -RuneLitePlus is licensed under the BSD 2-clause license. See the license header in the respective file to be sure. +openosrs is licensed under the BSD 2-clause license. See the license header in the respective file to be sure. ## Contribute and Develop diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index b795453512..94779595ac 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -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() diff --git a/http-service-plus/src/main/java/net/runelite/http/service/SpringBootWebApplication.java b/http-service-plus/src/main/java/net/runelite/http/service/SpringBootWebApplication.java index 50d94e97a9..27562f09f5 100644 --- a/http-service-plus/src/main/java/net/runelite/http/service/SpringBootWebApplication.java +++ b/http-service-plus/src/main/java/net/runelite/http/service/SpringBootWebApplication.java @@ -70,7 +70,7 @@ public class SpringBootWebApplication extends SpringBootServletInitializer @Override public void contextInitialized(ServletContextEvent sce) { - log.info("RuneLitePlus API started"); + log.info("openosrs API started"); } @Override @@ -93,27 +93,27 @@ public class SpringBootWebApplication extends SpringBootServletInitializer log.warn(null, ex); } - log.info("RuneLitePlus API stopped"); + log.info("openosrs API stopped"); } }; } - @ConfigurationProperties(prefix = "datasource.runeliteplus") + @ConfigurationProperties(prefix = "datasource.openosrs") @Bean("dataSourceRuneLite") public DataSourceProperties dataSourceProperties() { return new DataSourceProperties(); } - @ConfigurationProperties(prefix = "datasource.runeliteplus-cache") + @ConfigurationProperties(prefix = "datasource.openosrs-cache") @Bean("dataSourceRuneLiteCache") public DataSourceProperties dataSourcePropertiesCache() { return new DataSourceProperties(); } - @ConfigurationProperties(prefix = "datasource.runeliteplus-tracker") + @ConfigurationProperties(prefix = "datasource.openosrs-tracker") @Bean("dataSourceRuneLiteTracker") public DataSourceProperties dataSourcePropertiesTracker() { diff --git a/http-service-plus/src/main/resources/application.yaml b/http-service-plus/src/main/resources/application.yaml index 8e46babb83..8f21c31693 100644 --- a/http-service-plus/src/main/resources/application.yaml +++ b/http-service-plus/src/main/resources/application.yaml @@ -1,9 +1,9 @@ datasource: - runeliteplus: + openosrs: jndiName: java:comp/env/jdbc/runelite - runeliteplus-cache: + openosrs-cache: jndiName: java:comp/env/jdbc/runelite-cache2 - runeliteplus-tracker: + openosrs-tracker: jndiName: java:comp/env/jdbc/runelite-tracker # By default Spring tries to register the datasource as an MXBean, diff --git a/runelite-api/src/main/java/net/runelite/api/events/ProjectileSpawned.java b/runelite-api/src/main/java/net/runelite/api/events/ProjectileSpawned.java index 223e1cc579..7c11ea215f 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ProjectileSpawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ProjectileSpawned.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java index 0b90d14563..b7fd18af4c 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java +++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/build.gradle b/runelite-client/build.gradle index 2440424146..bd92cdf209 100644 --- a/runelite-client/build.gradle +++ b/runelite-client/build.gradle @@ -80,12 +80,12 @@ static def getDate() { def buildDate = getDate() processResources { - from file("src/main/resources/runelite.plus.properties"), { + from file("src/main/resources/open.osrs.properties"), { filter(ReplaceTokens, tokens: [ "project.version": project.version, "rs.version": rsversion.toString(), - "runelite.plus.version": plusVersion.toString(), - "runelite.plus.builddate": buildDate.toString() + "open.osrs.version": plusVersion.toString(), + "open.osrs.builddate": buildDate.toString() ]) } } diff --git a/runelite-client/src/main/java/net/runelite/client/Notifier.java b/runelite-client/src/main/java/net/runelite/client/Notifier.java index 4c2e37c97b..ee4fff642f 100644 --- a/runelite-client/src/main/java/net/runelite/client/Notifier.java +++ b/runelite-client/src/main/java/net/runelite/client/Notifier.java @@ -325,7 +325,7 @@ public class Notifier { if (OSType.getOSType() == OSType.Linux && !Files.exists(notifyIconPath)) { - try (InputStream stream = Notifier.class.getResourceAsStream("/runeliteplus.png")) + try (InputStream stream = Notifier.class.getResourceAsStream("/openosrs.png")) { Files.copy(stream, notifyIconPath); } diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 38f37f4e7e..eee889f244 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -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(); diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index 611064f162..f72bceffeb 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -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 diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java index ba6ef10c67..daee89d689 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java @@ -32,12 +32,12 @@ import java.util.Properties; @Singleton public class RuneLiteProperties { - private static final String RUNELITE_TITLE = "runelite.plus.title"; + private static final String RUNELITE_TITLE = "open.osrs.title"; private static final String RUNELITE_VERSION = "runelite.version"; - private static final String RUNELITE_PLUS_VERSION = "runelite.plus.version"; - private static final String RUNELITE_PLUS_DATE = "runelite.plus.builddate"; + private static final String RUNELITE_PLUS_VERSION = "open.osrs.version"; + private static final String RUNELITE_PLUS_DATE = "open.osrs.builddate"; private static final String RUNESCAPE_VERSION = "runescape.version"; - private static final String DISCORD_APP_ID = "runelite.plus.discord.appid"; + private static final String DISCORD_APP_ID = "open.osrs.discord.appid"; private static final String DISCORD_INVITE = "runelite.discord.invite"; private static final String GITHUB_LINK = "runelite.github.link"; private static final String WIKI_LINK = "runelite.wiki.link"; @@ -51,7 +51,7 @@ public class RuneLiteProperties static { - try (InputStream in = RuneLiteProperties.class.getResourceAsStream("/runelite.plus.properties")) + try (InputStream in = RuneLiteProperties.class.getResourceAsStream("/open.osrs.properties")) { properties.load(in); } diff --git a/runelite-client/src/main/java/net/runelite/client/SessionClient.java b/runelite-client/src/main/java/net/runelite/client/SessionClient.java index e88d558136..12399495cb 100644 --- a/runelite-client/src/main/java/net/runelite/client/SessionClient.java +++ b/runelite-client/src/main/java/net/runelite/client/SessionClient.java @@ -39,7 +39,7 @@ class SessionClient { UUID open() throws IOException { - HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder() + HttpUrl url = RuneLiteAPI.getopenosrsSessionBase().newBuilder() .build(); Request request = new Request.Builder() @@ -61,7 +61,7 @@ class SessionClient void ping(UUID uuid) throws IOException { - HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder() + HttpUrl url = RuneLiteAPI.getopenosrsSessionBase().newBuilder() .addPathSegment("ping") .addQueryParameter("session", uuid.toString()) .build(); @@ -81,7 +81,7 @@ class SessionClient void delete(UUID uuid) throws IOException { - HttpUrl url = RuneLiteAPI.getRuneLitePlusSessionBase().newBuilder() + HttpUrl url = RuneLiteAPI.getopenosrsSessionBase().newBuilder() .addQueryParameter("session", uuid.toString()) .build(); diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index 4f74a5e166..b0968d46a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -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); diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java b/runelite-client/src/main/java/net/runelite/client/config/openosrsConfig.java similarity index 97% rename from runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java rename to runelite-client/src/main/java/net/runelite/client/config/openosrsConfig.java index dfa9ea1032..573bd5591f 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/openosrsConfig.java @@ -26,8 +26,8 @@ */ package net.runelite.client.config; -@ConfigGroup("runeliteplus") -public interface RuneLitePlusConfig extends Config +@ConfigGroup("openosrs") +public interface OpenOSRSConfig extends Config { @ConfigItem( keyName = "enableOpacity", diff --git a/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java b/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java index d52a266cd3..64258fbc40 100644 --- a/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java +++ b/runelite-client/src/main/java/net/runelite/client/database/DatabaseManager.java @@ -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"; diff --git a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java index 45e9d29b50..ec5730788d 100644 --- a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java +++ b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java @@ -26,7 +26,7 @@ */ /* -Modified java.awt.Robot for use with RuneLitePlus. Hopefully we can make it stand far apart. +Modified java.awt.Robot for use with openosrs. Hopefully we can make it stand far apart. Uses https://github.com/JoonasVali/NaturalMouseMotion for mouse motion. diff --git a/runelite-client/src/main/java/net/runelite/client/game/WorldLocation.java b/runelite-client/src/main/java/net/runelite/client/game/WorldLocation.java index 8ff7dbeeb6..ed94b1ecee 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/WorldLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/game/WorldLocation.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2019 RuneLitePlus + * Copyright (c) 2019 openosrs * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * ST0NEWALL#9112 - * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * RuneLitePlus website: https://runelitepl.us + * openosrs Discord: https://discord.gg/Q7wFtCe + * openosrs website: https://openosrs.com ******************************************************************************/ package net.runelite.client.game; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java index 59a89d612d..85225bf97e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java @@ -46,7 +46,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.client.RuneLite; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigManager; -import net.runelite.client.config.RuneLitePlusConfig; +import net.runelite.client.config.OpenOSRSConfig; @Singleton @Slf4j @@ -54,7 +54,7 @@ public class PluginWatcher extends Thread { private static final File BASE = RuneLite.PLUGIN_DIR; - private final RuneLitePlusConfig runelitePlusConfig; + private final OpenOSRSConfig OpenOSRSConfig; private final PluginManager pluginManager; private final WatchService watchService; private final WatchKey watchKey; @@ -63,9 +63,9 @@ public class PluginWatcher extends Thread private ConfigManager configManager; @Inject - public PluginWatcher(RuneLitePlusConfig runelitePlusConfig, PluginManager pluginManager) throws IOException + public PluginWatcher(OpenOSRSConfig OpenOSRSConfig, PluginManager pluginManager) throws IOException { - this.runelitePlusConfig = runelitePlusConfig; + this.OpenOSRSConfig = OpenOSRSConfig; this.pluginManager = pluginManager; setName("Plugin Watcher"); @@ -85,7 +85,7 @@ public class PluginWatcher extends Thread @Override public void run() { - if (runelitePlusConfig.enablePlugins()) + if (OpenOSRSConfig.enablePlugins()) { scan(); } @@ -97,7 +97,7 @@ public class PluginWatcher extends Thread WatchKey key = watchService.take(); Thread.sleep(50); - if (!runelitePlusConfig.enablePlugins()) + if (!OpenOSRSConfig.enablePlugins()) { key.reset(); continue; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java index e1550efe33..52cdc75274 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java index 96aafeef5e..34313e61ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java @@ -1,7 +1,7 @@ /* * Copyright (c) 2018, Jacob M * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java index b89bc86148..5019de1647 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java index 0290e6a568..29e8b94f97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultConfig.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java index 51117d7941..01ea64478f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index b1b8d414df..b46bed46f4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -2,7 +2,7 @@ * Copyright (c) 2018, Cameron * Copyright (c) 2018, Jacob M * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/DeathTimesMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/DeathTimesMode.java index 4083ce8ba4..30f0e9792c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/DeathTimesMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/DeathTimesMode.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java index 8a2154889c..c6f1e0c2ad 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Healer.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java index db06ce39fe..1c5651ce00 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Menus.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java index 3b3260f559..1f1e58e26a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java @@ -1,7 +1,7 @@ /* * Copyright (c) 2018, Cameron * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java index 2cc3e6a3b3..59fe249b03 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018, Jacob M - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java index 18e9077e38..c936e82352 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, https://runelitepl.us + * Copyright (c) 2019, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java index b3261d53c3..36adc1efcc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java index feee859d9a..9f90ab7612 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java @@ -1,7 +1,7 @@ /* * Copyright (c) 2018, Jacob M * Copyright (c) 2019, 7ate9 - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 317368bf0e..f3f3b7aab1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -101,7 +101,7 @@ import net.runelite.client.config.Keybind; import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.config.Range; import net.runelite.client.config.RuneLiteConfig; -import net.runelite.client.config.RuneLitePlusConfig; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginInstantiationException; @@ -139,13 +139,13 @@ public class ConfigPanel extends PluginPanel private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value(); private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins"; private static final String RUNELITE_PLUGIN = "RuneLite"; - private static final String RUNELITEPLUS_PLUGIN = "RuneLitePlus"; + private static final String openosrs_PLUGIN = "openosrs"; private static final String CHAT_COLOR_PLUGIN = "Chat Color"; private final PluginManager pluginManager; private final ConfigManager configManager; private final ScheduledExecutorService executorService; private final RuneLiteConfig runeLiteConfig; - private final RuneLitePlusConfig runeLitePlusConfig; + private final OpenOSRSConfig OpenOSRSConfig; private final ChatColorConfig chatColorConfig; private final ColorPickerManager colorPickerManager; public static List 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 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); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java index df55dd0818..e68e2b7786 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java @@ -36,7 +36,7 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.RuneLiteConfig; -import net.runelite.client.config.RuneLitePlusConfig; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.eventbus.EventBus; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.PluginChanged; @@ -76,7 +76,7 @@ public class ConfigPlugin extends Plugin private RuneLiteConfig runeLiteConfig; @Inject - private RuneLitePlusConfig runeLitePlusConfig; + private OpenOSRSConfig OpenOSRSConfig; @Inject private ChatColorConfig chatColorConfig; @@ -95,7 +95,7 @@ public class ConfigPlugin extends Plugin { addSubscriptions(); - configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, runeLitePlusConfig, chatColorConfig, colorPickerManager); + configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, OpenOSRSConfig, chatColorConfig, colorPickerManager); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "config_icon.png"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 0a226cb72b..736aabca26 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -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); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java index 91c7a4b065..713779892a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java index 967d0fb730..d0b244a903 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 9ae984da09..c4417bd145 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java index 20f1c2f9be..40890eba2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java index afe3107282..fa193796f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java index bc3c398cb6..c0acd20c66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java index 03e668140d..0784dac22b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Kyle * Copyright (c) 2018, Raiever * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java index 75385bfa4b..a91a495b25 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Kyle * Copyright (c) 2018, Raiever * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PrayerTabStates.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PrayerTabStates.java index 356f44a910..d79bcaf7c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PrayerTabStates.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/util/PrayerTabStates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Kyle * Copyright (c) 2018, Raiever * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraConfig.java index f98bcfba87..a92a3789ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java index 751db82ee1..6d87a08567 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java index 3e392cd878..c252ec0949 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index 10deba1016..9af3eb7522 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java index 977bb80afc..67b5703bb7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java index eb079846cf..d8fea0ca5d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, Kyleeld - * Copyright (c) 2019, RuneLitePlus + * Copyright (c) 2019, openosrs * * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java index e903c5eddf..df34ef3d50 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java @@ -113,7 +113,7 @@ public class InfoPanel extends PluginPanel JLabel version = new JLabel(htmlLabel("RuneLite version: ", RuneLiteProperties.getVersion())); version.setFont(smallFont); - JLabel plusVersion = new JLabel(htmlLabel("RuneLitePlus version: ", RuneLiteProperties.getPlusVersion())); + JLabel plusVersion = new JLabel(htmlLabel("Openosrs version: ", RuneLiteProperties.getPlusVersion())); plusVersion.setFont(smallFont); JLabel revision = new JLabel(); @@ -168,7 +168,7 @@ public class InfoPanel extends PluginPanel actionsContainer.add(buildLinkPanel(GITHUB_ICON, "License info", "for distribution", "https://github.com/runelite-extended/runelite/blob/master/LICENSE")); actionsContainer.add(buildLinkPanel(FOLDER_ICON, "Open logs directory", "(for bug reports)", LOGS_DIR)); actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "discord server", "https://discord.gg/HN5gf3m")); - actionsContainer.add(buildLinkPanel(PATREON_ICON, "Patreon to support", "the RuneLitePlus devs", RuneLiteProperties.getPatreonLink())); + actionsContainer.add(buildLinkPanel(PATREON_ICON, "Patreon to support", "the openosrs devs", RuneLiteProperties.getPatreonLink())); /* actionsContainer.add(buildLinkPanel(WIKI_ICON, "Information about", "RuneLite and plugins", runeLiteProperties.getWikiLink()));*/ add(versionPanel, BorderLayout.NORTH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java index 8e8761e1f3..6a91aecbf8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java index 95d4276a52..594931fdb0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupConfig.java index 1c49ba73d4..1a0f42f961 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupConfig.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java index 7849c817d8..a3136be8b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupItem.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index 77a7a66f61..be48a12af5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java index 794f7217b8..5fd8132e06 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java index 6802ecee8a..a2244932cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java index fecaf28ce5..0ad4e36247 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java index 77d99029ed..771d750c9e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java index bf05e88178..3a1476c8ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2019, Ethan - * 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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java index bc37d03b27..8a80d84de0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2018, https://runelitepl.us - * Copyright (c) 2018, https://github.com/runeliteplusplus + * Copyright (c) 2018, https://openosrs.com + * Copyright (c) 2018, https://github.com/openosrsplus * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickConfig.java index a10cee98c3..b0f9613a27 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanConfig.java index de333f58a7..a7ea4053a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index 41f9c61624..1e824d1385 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java index 627af82c31..28f962fd26 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java index 2ccc721ddf..4fbb7df709 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java index c230e18de6..f9d5e7a0c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootRecordDateFilter.java @@ -1,11 +1,11 @@ /* * ****************************************************************************** - * * Copyright (c) 2019 RuneLitePlus + * * Copyright (c) 2019 openosrs * * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * * ST0NEWALL#9112 - * * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * * RuneLitePlus website: https://runelitepl.us + * * openosrs Discord: https://discord.gg/Q7wFtCe + * * openosrs website: https://openosrs.com * ***************************************************************************** */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/BurningAmuletMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/BurningAmuletMode.java index 3f198e2794..94f1c20038 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/BurningAmuletMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/BurningAmuletMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/CombatBraceletMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/CombatBraceletMode.java index 20bfe21abe..fff1333f2b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/CombatBraceletMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/CombatBraceletMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/DigsitePendantMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/DigsitePendantMode.java index dd9b58eea5..fb13479294 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/DigsitePendantMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/DigsitePendantMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/NecklaceOfPassageMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/NecklaceOfPassageMode.java index b0ae87e8c5..4a13454930 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/NecklaceOfPassageMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/NecklaceOfPassageMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/RingOfWealthMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/RingOfWealthMode.java index adab01804a..32543603f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/RingOfWealthMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/RingOfWealthMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SkillsNecklaceMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SkillsNecklaceMode.java index a6624bf572..acb72e760b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SkillsNecklaceMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SkillsNecklaceMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SlayerRingMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SlayerRingMode.java index 2d103756ae..d59e5f48f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SlayerRingMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/SlayerRingMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/XericsTalismanMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/XericsTalismanMode.java index e559171fff..9b0fd87290 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/XericsTalismanMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/XericsTalismanMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2018, Kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java similarity index 94% rename from runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java rename to runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java index 2a2086fa5b..05448c2497 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java @@ -24,7 +24,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -package net.runelite.client.plugins.runeliteplus; +package net.runelite.client.plugins.openosrs; import java.awt.event.KeyEvent; import javax.inject.Inject; @@ -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; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicationLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicationLocation.java index 3d63e8faa7..a10a638e45 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicationLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicationLocation.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2019 RuneLitePlus + * Copyright (c) 2019 openosrs * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * ST0NEWALL#9112 - * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * RuneLitePlus website: https://runelitepl.us + * openosrs Discord: https://discord.gg/Q7wFtCe + * openosrs website: https://openosrs.com ******************************************************************************/ package net.runelite.client.plugins.playerindicators; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerRelation.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerRelation.java index b1e6f82c7d..ac4b346b2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerRelation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerRelation.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2019 RuneLitePlus + * Copyright (c) 2019 openosrs * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * ST0NEWALL#9112 - * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * RuneLitePlus website: https://runelitepl.us + * openosrs Discord: https://discord.gg/Q7wFtCe + * openosrs website: https://openosrs.com ******************************************************************************/ package net.runelite.client.plugins.playerindicators; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoConfig.java index 617840fc39..a4c34e5797 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java index 85d155dac9..f976c61171 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java index 285cac241c..1b99b22165 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterConfig.java index a4602d2900..aa9fb74073 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 8cf441642c..7dcf8118f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index 1822a9044e..2ee0d0e1a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -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.

You can now add as many accounts as you would like.

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 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java index 0f5cde0c19..846388dcde 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java index 8924e5e9df..b465d812a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java @@ -1,11 +1,11 @@ /* * ****************************************************************************** - * * Copyright (c) 2019 RuneLitePlus + * * Copyright (c) 2019 openosrs * * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * * ST0NEWALL#9112 - * * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * * RuneLitePlus website: https://runelitepl.us + * * openosrs Discord: https://discord.gg/Q7wFtCe + * * openosrs website: https://openosrs.com * ***************************************************************************** */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index f77066388c..2d5d4c0fa7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -1,11 +1,11 @@ /* * ****************************************************************************** - * * Copyright (c) 2019 RuneLitePlus + * * Copyright (c) 2019 openosrs * * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * * ST0NEWALL#9112 - * * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * * RuneLitePlus website: https://runelitepl.us + * * openosrs Discord: https://discord.gg/Q7wFtCe + * * openosrs website: https://openosrs.com * ***************************************************************************** */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersConfig.java index 4f47e41ba7..454bbf0af4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, RuneLitePlus + * Copyright (c) 2019, openosrs * Copyright (c) 2019, kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java index 740a901e51..f85b6d9e64 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2019, jkybtw - * Copyright (c) 2019, RuneLitePlus + * Copyright (c) 2019, openosrs * Copyright (c) 2019, kyle * All rights reserved. * diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index 5a0dcd7489..fc89a74dc9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -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, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java index b0ebab25a9..f3827fe4b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/AcidPathOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Infinitay * * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java index b2fd6551ed..7feb618893 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Infinitay * * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java index 11b363fa72..7a882d527d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Infinitay * * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java index 60063c25e5..120a0143b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, https://runelitepl.us + * Copyright (c) 2018, https://openosrs.com * Copyright (c) 2019, Infinitay * * All rights reserved. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index 339e1914d7..33185950a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -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 * ***************************************************************************** */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java index 1822b94e94..7f461c8e23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java @@ -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 * ***************************************************************************** */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsConfig.java index 8b257b6ae2..aa81aec5f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsConfig.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2019 RuneLitePlus + * Copyright (c) 2019 openosrs * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * ST0NEWALL#9112 - * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * RuneLitePlus website: https://runelitepl.us + * openosrs Discord: https://discord.gg/Q7wFtCe + * openosrs website: https://openosrs.com ******************************************************************************/ package net.runelite.client.plugins.wildernesslocations; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java index cbf56934e0..f551546316 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsMapOverlay.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2019 RuneLitePlus + * Copyright (c) 2019 openosrs * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * ST0NEWALL#9112 - * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * RuneLitePlus website: https://runelitepl.us + * openosrs Discord: https://discord.gg/Q7wFtCe + * openosrs website: https://openosrs.com ******************************************************************************/ package net.runelite.client.plugins.wildernesslocations; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index 195034837d..310a7867b5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2019 RuneLitePlus + * Copyright (c) 2019 openosrs * Redistributions and modifications of this software are permitted as long as this notice remains in its original unmodified state at the top of this file. * If there are any questions comments, or feedback about this software, please direct all inquiries directly to the file authors: * ST0NEWALL#9112 - * RuneLitePlus Discord: https://discord.gg/Q7wFtCe - * RuneLitePlus website: https://runelitepl.us + * openosrs Discord: https://discord.gg/Q7wFtCe + * openosrs website: https://openosrs.com ******************************************************************************/ package net.runelite.client.plugins.wildernesslocations; diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 1889b0e803..a573fab527 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -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); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 5a3b0b9f6d..cbf904ffcf 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -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)); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java index 7d4e730bdd..4dbe23db63 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java @@ -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()); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java index 0a9ed9007c..5cee418ede 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/InfoPanel.java @@ -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_transparent.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); } @@ -120,7 +120,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++; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java index 0d3bb03cd7..3da446ec3d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/components/MessagePanel.java @@ -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); diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java index 1dc821434f..92fc0dad7b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java @@ -392,13 +392,13 @@ public class SwingUtil stylizeJPanels(pane); final Frame frame = component == null ? JOptionPane.getRootFrame() : JOptionPane.getFrameForComponent(component); - final JDialog dialog = new JDialog(frame, "RuneLitePlus Error", true); + final JDialog dialog = new JDialog(frame, "openosrs Error", true); dialog.setContentPane(pane); dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); dialog.setAlwaysOnTop(true); dialog.setAutoRequestFocus(true); dialog.setLocationRelativeTo(null); - dialog.setIconImage(ImageUtil.getResourceStreamFromClass(SwingUtil.class, "/runeliteplus_transparent.png")); + dialog.setIconImage(ImageUtil.getResourceStreamFromClass(SwingUtil.class, "/openosrs_transparent.png")); // Listen for value changes and close dialog when necessary pane.addPropertyChangeListener(e -> { diff --git a/runelite-client/src/main/resources/runelite.plus.properties b/runelite-client/src/main/resources/open.osrs.properties similarity index 62% rename from runelite-client/src/main/resources/runelite.plus.properties rename to runelite-client/src/main/resources/open.osrs.properties index 8c82b04457..37f91c2e05 100644 --- a/runelite-client/src/main/resources/runelite.plus.properties +++ b/runelite-client/src/main/resources/open.osrs.properties @@ -1,13 +1,13 @@ runelite.version=@project.version@ runescape.version=@rs.version@ -runelite.plus.discord.appid=560644885250572289 -runelite.discord.invite=https://discord.gg/HN5gf3m +open.osrs.discord.appid=560644885250572289 +runelite.discord.invite=https://discord.gg/openosrs runelite.github.link=https://github.com/runelite-extended/runelite runelite.wiki.link=https://github.com/runelite-extended/runelite/wiki -runelite.patreon.link=https://www.patreon.com/RuneLitePlus -runelite.plus.title=RuneLitePlus -runelite.plus.version=@runelite.plus.version@ -runelite.plus.builddate=@runelite.plus.builddate@ +runelite.patreon.link=https://www.patreon.com/openosrs +open.osrs.title=OpenOSRS +open.osrs.version=@open.osrs.version@ +open.osrs.builddate=@open.osrs.builddate@ runelite.wiki.troubleshooting.link=https://github.com/runelite/runelite/wiki/Troubleshooting-problems-with-the-client runelite.wiki.building.link=https://github.com/runelite-extended/runelite/wiki/Building-with-IntelliJ-IDEA runelite.dnschange.link=https://1.1.1.1/dns/ \ No newline at end of file diff --git a/runelite-client/src/main/resources/runeliteplus.png b/runelite-client/src/main/resources/openosrs.png similarity index 100% rename from runelite-client/src/main/resources/runeliteplus.png rename to runelite-client/src/main/resources/openosrs.png diff --git a/runelite-client/src/main/resources/runeliteplus_transparent.png b/runelite-client/src/main/resources/openosrs_transparent.png similarity index 100% rename from runelite-client/src/main/resources/runeliteplus_transparent.png rename to runelite-client/src/main/resources/openosrs_transparent.png diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java index 9cacb827af..84e108ed87 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java @@ -36,7 +36,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; -import net.runelite.client.config.RuneLitePlusConfig; +import net.runelite.client.config.OpenOSRSConfig; import net.runelite.api.util.Text; import static org.junit.Assert.assertEquals; import org.junit.Before; @@ -69,7 +69,7 @@ public class ChatNotificationsPluginTest @Mock @Bind - private RuneLitePlusConfig runeLitePlusConfig; + private OpenOSRSConfig OpenOSRSConfig; @Inject private ChatNotificationsPlugin chatNotificationsPlugin; diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java index 02cf730a39..0a590af62d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, https://runelitepl.us + * Copyright (c) 2019, https://openosrs.com * All rights reserved. * * Redistribution and use in source and binary forms, with or without