Commit Graph

9707 Commits

Author SHA1 Message Date
ST0NEWALL
0b2a19f085 delet 2020-05-27 00:16:19 -04:00
stone-wall
ad9a2025e5 Revert "infobox manager: make threadsafe"
This reverts commit ba9ffb1d
2020-05-27 00:02:14 -04:00
OpenOSRS
192a298d6b Client: Update NPC stats 2020-05-27 00:09:50 +00:00
Owain van Brakel
a5c42eacb5 Merge remote-tracking branch 'runelite/master' 2020-05-26 04:14:23 +02:00
Jordan
a36d38229f Merge pull request #11687 from abextm/overcannonicalize-item 2020-05-25 18:31:18 -07:00
Jordan
13b5104d5a Merge pull request #11516 from melkypie/report-24hclock 2020-05-25 17:03:23 -07:00
Jordan
7b964aea63 Merge pull request #11645 from abextm/npcaggro-colorconfig 2020-05-25 16:54:07 -07:00
Owain van Brakel
0201601aa1 Merge pull request #2624 from Owain94/upstream-2505 2020-05-26 01:00:45 +02:00
Owain van Brakel
9d1edf8b58 Merge remote-tracking branch 'runelite/master' 2020-05-26 00:53:47 +02:00
Owain van Brakel
99af99cf32 Merge pull request #2623 from Owain94/NameableContainer 2020-05-26 00:44:33 +02:00
Owain van Brakel
ad1b7b8a0c mixins: refactor to use NameableContainer 2020-05-25 21:48:15 +02:00
swazrgb
b8bf019667 client: Set JarPluginRepository#comparator to null
The default pf4j comparator casts longs to ints which breaks
the sort. Since we don't actually rely on this sorting, simply
set the comparator to `null`.

See https://github.com/open-osrs/runelite/pull/2621 for more info
2020-05-25 15:47:48 +02:00
Jan-Willem de Bruyn
5f84e28a14 skillcalculator: Add clay crafting items (#11518) 2020-05-25 06:31:59 +00:00
Jordan
2d351768fb Merge pull request #11509 from RobertCurll/master 2020-05-24 23:13:09 -07:00
Daniel
fc7e697aa7 item prices: always show tooltip when alching if option is enabled 2020-05-25 06:09:53 +00:00
Broooklyn
4faf36edc2 loottracker: Improve ignored events config name and description (#11545) 2020-05-25 04:45:45 +00:00
Jordan
2e90212a24 Merge pull request #11161 from TheFlemoid/Issue11158 2020-05-24 21:31:46 -07:00
Owain van Brakel
e1bfcfc365 externalpluginmanager: Mimic PluginManager.scanAndInstantiate closer 2020-05-25 05:54:13 +02:00
Owain van Brakel
1a023f52f4 Revert "Revert "rxrelay: Pull artifact from mvn""
This reverts commit 0760673aca.
2020-05-25 04:57:09 +02:00
Kyle
0760673aca Revert "rxrelay: Pull artifact from mvn" 2020-05-25 03:04:05 +01:00
Owain van Brakel
d772b3211d externalpf4jpluginmanager: Remove JarPluginRepository getPluginPath
override
2020-05-25 03:10:03 +02:00
Trey
0b62acbcaf cluescrolls: Add Dragontooth Island travel info to clue
This commit adds information on reaching Dragontooth Island for the clue
step located there.
2020-05-24 18:06:11 -07:00
Owain van Brakel
7eb5b00587 Merge remote-tracking branch 'swazrgb/cleanup-externalmanager' 2020-05-25 03:03:38 +02:00
Trey
db592bcad0 cluescrolls: Add jungle traversing info to dragon's eye clue
This commit adds information on traversing the Kharazi jungle prior to
reaching the Viyeldi caves.
2020-05-24 18:03:17 -07:00
Owain van Brakel
945e0a4a3f Merge pull request #2615 from open-osrs/add-default-pluginhub 2020-05-25 02:58:11 +02:00
Owain van Brakel
bfe36d06d5 Merge pull request #2616 from Owain94/rxrelaymvn 2020-05-25 02:57:40 +02:00
OpenOSRS
e22cf68ef1 Client: Update NPC stats 2020-05-25 00:09:29 +00:00
Owain van Brakel
91b0dffcf1 rxrelay: Pull artifact from mvn 2020-05-25 01:58:35 +02:00
Kyle
ca026a66e9 Update RepositoryBox.java 2020-05-25 00:42:13 +01:00
Kyle
ba3a24ab63 Update ExternalPluginManager.java 2020-05-25 00:28:48 +01:00
Kyle
59727ca56d Update OpenOSRSConfig.java 2020-05-25 00:27:49 +01:00
swazrgb
0890be9c30 Also clear repositories when split length is invalid 2020-05-24 23:38:39 +02:00
swazrgb
052ebc3c7b client: Clean up ExternalPluginManager & friends 2020-05-24 23:17:34 +02:00
Adam
8e06e398ee chathistory: small cleanups of clear history 2020-05-24 17:12:31 -04:00
Tinus Flagstad
8d62ba9416 keyremapping: add option to remap space in dialog 2020-05-24 16:44:33 -04:00
Max Weber
a54374e931 HotkeyButton: allow binding the space key 2020-05-24 16:25:31 -04:00
Adam
ba9ffb1d60 infobox manager: make threadsafe
Currently this gets called from multiple threads, mostly client and EDT,
causing unsafe acces to infoBoxes.
2020-05-24 15:52:28 -04:00
Adam
cb1fc598ba plugins: add Plugin::getName
This avoids the infobox manager from having to access plugin descriptor
annotations, making it easier to write tests for
2020-05-24 15:52:28 -04:00
Owain van Brakel
37b14eaa1d Merge pull request #2611 from swazrgb/externalplugins-developmentmode 2020-05-24 21:09:50 +02:00
Owain van Brakel
f70794bc18 Merge pull request #2612 from swazrgb/shutdown-executor
client: Also shutdown executor in PluginManager
2020-05-24 19:35:58 +02:00
swazrgb
1644dbd245 Also shutdown executor in PluginManager 2020-05-24 19:17:20 +02:00
Owain van Brakel
0df61a55cc Merge pull request #2607 from Owain94/externalpanelerrormsg 2020-05-24 18:54:20 +02:00
Max Weber
98395b94b1 ItemManager: only canonicalize notes
f9d3647db1 made ItemManager return a price
for placeholders, which is wrong.
2020-05-24 09:51:51 -06:00
Vidyogamasta
0168bf0422 loot tracker: float group to top of list when obtaining drop 2020-05-24 11:41:26 -04:00
Adam
e9aac02a43 keyremapping: use modified key map for mapping key release
This cleans up the code some and is more-correct since it will eg. no
longer remap fkeys on keyrelease even when it was not remapped on
keypress.
2020-05-24 10:32:52 -04:00
swazrgb
e23c6a0c46 Support loading external plugins from sources enabling hotswapping
Enables the pf4j [development mode](https://pf4j.org/doc/development-mode.html)
to support loading external plugins from sources, which enables java's
hotswap functionality.

To use this feature set the `plugin.development.path` property or
`PLUGIN_DEVELOPMENT_PATH` environment variable to the directories
containing your plugins, e.g. `../plugins;../my-custom-plugins`

Once set the `ExternalPluginManager` will ignore the configured
repositories and externalmanager directory, and instead load all
the built plugins from the specified directories.

Utilizing this feature does require some additional configuration
of the build of the plugins `build.gradle.kts`. Within the `subprojects`
section add:

```
tasks.register<Copy>("copyDeps") {
    into("./build/deps/")
    from(configurations["runtimeClasspath"])
}
```

See https://github.com/open-osrs/plugins/pull/260 for the `openosrs/plugins` change

This enables the following workflow:

0. Optional tip: Set the `external.system.substitute.library.dependencies` registry value to `true` to force classpath resolution within the project

1. Open the `runelite-client` project in IntelliJ

2. Add the `plugins` repository as a module (Gradle -> Plus symbol ->
`plugins/build.gradle.kts`)

3. Gradle build the client with: `build publishToMavenLocal :runelite-client:publishToMavenLocal :runelite-api:publishToMavenLocal :http-api:publishToMavenLocal`

4. Gradle build the plugins with: `build copyDeps`

5. Add the `PLUGIN_DEVELOPMENT_PATH` environment variable to the run
configuration

Once the above is done the edit -> reload -> edit cycle can begin:

1. Start the client in debug mode using the run goal

2. Edit the external plugin

3. Perform Build > Build Module

4. Observe hotswapping in action!

5. If hotswapping failed, or your change requires a plugin restart,
click the hotswap button in the plugin list to instantly restart it
2020-05-24 08:27:37 +02:00
swazrgb
3ce0cb9dc1 Shutdown ExecutorService in ExternalPluginManager
Also name threads for easy identification
2020-05-24 03:29:30 +02:00
OpenOSRS
fbe29a79b5 Client: Update NPC stats 2020-05-24 00:09:18 +00:00
Jordan Atwood
c2a9ac443b client: Simplify ItemContainer usage
Because itemManager#getItemPrice() canonicalizes the passed item ID, it
is no longer necessary to get noted items' base IDs or otherwise
canonicalize item IDs before interacting with the method.
2020-05-23 16:22:29 -04:00
Jordan Atwood
f9d3647db1 itemmanager: Canonicalize price lookup item IDs 2020-05-23 16:22:29 -04:00