Commit Graph
100 Commits
Author SHA1 Message Date
Tomas Slusny e38f0a196a Use HSB instead of RGBA to generate color from object
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-07 13:19:57 +01:00
Tomas Slusny b4da87a473 Merge pull request #7729 from deathbeam/enhance-ws-client-logging
Improve WSClient and party logging
2019-02-07 09:01:44 +00:00
Tomas Slusny 107f08f5e2 Merge pull request #7704 from deathbeam/add-color-hashes
Recolor party pings and names based on name color hash
2019-02-06 08:03:38 +00:00
Tomas Slusny 94e4a210a3 Recolor party pings and names based on name color hash
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-06 08:31:38 +01:00
Tomas Slusny e9881dd540 Add ColorUtil#fromObject to generate color from object
Add utility method that can generate color based on object hashCode.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-06 08:31:38 +01:00
Tomas Slusny 6609cc063f Merge pull request #7727 from RyBo/kourend-library-typo
Fix typo in Kourend Library config
2019-02-06 07:28:51 +00:00
Tomas Slusny 7beee692a2 Merge pull request #7714 from deathbeam/user-sync-cleanup
Make party UserSync event extend PartyMemberMessage
2019-02-06 07:26:31 +00:00
Tomas Slusny 8c32614ac5 Improve WSClient and party logging
- Remove duplicate logging from both WSClient and plugins listening for
incoming messages
- Log json instead of deserialized message on receiving message (because
toString might not be properly implemented)

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-06 08:15:47 +01:00
Tomas Slusny 18610d6804 Make party UserSync event extend PartyMemberMessage
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-06 08:12:42 +01:00
Tomas Slusny 09a7dd7579 Merge pull request #7708 from deathbeam/fix-overflow
Prevent negative values when overlay is bigger than screen
2019-02-06 06:59:43 +00:00
Tomas Slusny 4e2de5ecbd Prevent negative values when overlay is bigger than screen
This would throw except because Ints.constrainToRange would be between
0 and negative number in case overlay is bigger than screen.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-06 07:47:40 +01:00
Tomas Slusny 89dd417d56 Merge pull request #7694 from deathbeam/show-local-sounds-party
Play party ping sound only when ping is in scene
2019-02-05 09:11:03 +00:00
Tomas Slusny 39e8f4326b Merge pull request #7693 from deathbeam/fix-party-bars-dissapearing
Do not hide party bars when value is changed to 0
2019-02-04 10:20:51 +00:00
Tomas Slusny 5f38f74c6f Play party ping sound only when ping is in scene
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-04 00:18:38 +01:00
Tomas Slusny d2e6c7d0fd Do not hide party bars when value is changed to 0
Instead of checking for current value being > 0 to determine if we have
any stat data, instead check for max value.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-04 00:15:08 +01:00
Tomas Slusny f49e59b559 Fix Discord party size refresh
When force-refreshing discord presence use updated party size values.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-04 00:13:41 +01:00
Tomas Slusny ea79c39b4e Merge pull request #7657 from deathbeam/request-party-sync
Request party sync on party plugin startup
2019-02-03 12:06:06 +00:00
Tomas Slusny 0b7672d12d Merge pull request #7673 from deathbeam/try-catch-ws-message
Prevent WSMessage deserialization failure from closing websocket
2019-02-03 11:27:48 +00:00
Tomas Slusny e4828a597c Prevent WSMessage deserialization failure from closing websocket
As messages that are serialized and deserialized are purely option and
can vary between source and destination, simply catch deserialization
failure to prevent OkHttp from closing websocket.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-03 00:47:22 +01:00
Tomas Slusny 04f076a6b8 Merge pull request #7566 from ShaunDreclin/sulphur-lizard-health
Add Sulphur Lizard to npc_health.json
2019-02-02 18:52:47 +00:00
Tomas Slusny c15cf1025d Merge pull request #7655 from deathbeam/fix-party-exceptions
Fix party exceptions (NPE in PartyPlugin and ConcurrentModification in PartyStatsOverlay)
2019-02-02 18:51:57 +00:00
Tomas Slusny f52c1d732b Fix ConcurrentModification in party stats overlay
Fix concurrent modification exception in party stats overlay when
iterating map.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-02 12:34:56 +01:00
Tomas Slusny 92427968b0 Check for localMember in party not being null on UserJoin
Local user joins last, so all UserJoin events before that will throw NPE
here.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-02 12:34:56 +01:00
Tomas Slusny 137e7e7e30 Merge pull request #7640 from Kamielvf/chambers-layouts-fix
raids plugin: Update LayoutSolver layout codes
2019-02-02 11:26:38 +00:00
Tomas Slusny bb81128478 Merge pull request #7656 from deathbeam/fix-party-discord-refresh
Do not reset current activity on discord party update
2019-02-02 11:16:16 +00:00
Tomas Slusny a0a86a9f78 Merge pull request #7659 from Nightfirecat/isempty
client: Use isEmpty() for all Collection emptiness checks
2019-02-02 11:08:50 +00:00
Tomas Slusny e5f3b772a7 Merge pull request #7651 from deathbeam/remove-tag-option
Remove "Tag" toggle from NPC indicators
2019-02-02 11:07:21 +00:00
Tomas Slusny fb41c05d3f Request party sync on party plugin startup
If user is in party request party data syncup on party plugin startup

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 23:30:18 +01:00
Tomas Slusny 8ff8617755 Do not reset current activity on discord party update
Instead of setting activity to in_game, in_menu just send again current
discord activity.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 22:02:48 +01:00
Tomas Slusny 89ba0d8d43 Remove "Tag" toggle from NPC indicators
This toggle was here originally because NPC tagging did not required
shift, but now it does so to bring it with line of other shift-click
plugins, simply remove this option.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 17:16:20 +01:00
Tomas Slusny 29fcc2747f Merge pull request #7639 from deathbeam/wtf
Move timestamp color config to timestamp plugin
2019-02-01 09:12:24 +00:00
Tomas Slusny 99d58bb7f2 Merge pull request #7647 from deathbeam/add-missing-config-check
Add missing config check to party leave message
2019-02-01 07:30:42 +00:00
Tomas Slusny 874246bc55 Add missing config check to party leave message
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 08:23:13 +01:00
Tomas SlusnyandAdam 1a7946660c Add party plugin
Co-authored-by: Adam <Adam@sigterm.info>
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:47:56 -05:00
Tomas Slusny 703ad06a4e Add party support to Discord plugin
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:47:55 -05:00
Tomas Slusny 5d07305ac3 Use new /ws service
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:47:55 -05:00
Tomas Slusny 6a93ee2ffe Save current Discord user in Discord service
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:47:55 -05:00
Tomas Slusny c198433bb6 Prevent ProgressBarComponent from overflowing
Limit max bar width to 100% to prevent overflowing.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:47:55 -05:00
Tomas SlusnyandAdam- 3fb537a9f5 Add party-related websocket messages
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
Co-authored-by: Adam- <adam@sigterm.info>
2019-01-31 19:47:55 -05:00
Tomas Slusny b676985e3b Make WebsocketGsonFactory more extensible
- Expose methods for creating gson adapters from pre-defined factory
messages + user-specified messages
- Expose methods for creating Gson object from adapter factory

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:47:55 -05:00
Tomas Slusny 5370049133 Move timestamp color config to timestamp plugin
This color is used ONLY in timestamp plugin but it was for some
reason included in core.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-31 19:33:15 +01:00
Tomas Slusny 4e4bd3f359 Merge pull request #7039 from raiyni/pr-6414
Add custom RuneLite Color picker
2019-01-30 21:14:37 +00:00
Tomas Slusny ea834563db Merge pull request #7627 from Lucwousin/fix-clue-chat-colour
Add normal colour to the !clues command
2019-01-30 13:37:19 +00:00
Tomas Slusny 32f683cd71 Merge pull request #7621 from deathbeam/dots-are-lame
Remove anymatch regex from chat commands plugin patterns
2019-01-30 08:30:55 +00:00
Tomas Slusny 1d50c70d41 Merge pull request #7616 from RyBo/hot-cold-clues
Change location of clue scroll coordinates in Feldip Hills
2019-01-30 08:30:29 +00:00
Tomas Slusny 14cd865d07 Remove anymatch regex from chat commands plugin patterns
To avoid breaking existing plugins instead of properly escaping anymatch
(dot) just remove it as it do not changes the functionality.

Fixes #7615

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-30 09:13:26 +01:00
Tomas Slusny 5c0d3f073c Merge pull request #7606 from deathbeam/show-xp-target-only-if-larget
Show xp globe goal only if goal > current xp
2019-01-29 07:24:02 +00:00
Tomas Slusny 91f34d74d9 Show xp globe goal only if goal > current xp
Closes #7066

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-28 22:34:27 +01:00
Tomas Slusny 7b8676d6f9 Merge pull request #7564 from deathbeam/remove-description-from-discord
Remove activity prefix from Discord plugin
2019-01-28 20:57:43 +00:00
Tomas Slusny 5dd2006301 Merge pull request #7543 from deathbeam/infobox-poison-stuff
Add anti-poison timers to anti-venom potions
2019-01-28 06:50:58 +00:00
Tomas Slusny 180d8d91a6 barrows plugin: don't draw dots for npcs which are hidden on the minimap
Check the isMinimapVisable variable before drawing NPC dot on minimap in
barrows plugin.

Fixes #6672

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-26 11:58:27 -05:00
Tomas Slusny 29d938500e Merge pull request #7572 from deathbeam/dont-display-bank-ge-ha
Dont display bank value GE/HA text when not needed
2019-01-26 12:17:27 +00:00
Tomas Slusny 17067db7b6 Dont display bank value GE/HA text when not needed
If showing only GE or HA value do not add the GE/HA prefix.

Closes #1479

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-26 12:50:47 +01:00
Tomas Slusny 9a520b9d92 Merge pull request #7545 from deathbeam/add-layout-message
Add raid layout message
2019-01-26 11:35:10 +00:00
Tomas Slusny 49965affe1 Add option to require shift for overlay menus
Enabled by default. This was on original PR review and was discussed in
Discord. It is better to just use what we already use for adding our
custom entries at other places, and there is possibility that overlays
will have a lot of right click menus in future, so making it require
shift is most sane option.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-26 11:52:50 +01:00
Tomas Slusny d1f4b577ce Remove activity prefix from Discord plugin
The space in the Discord Rich Presence is very limited and it is being
truncated by non-important prefix, so remove this prefix.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-26 01:59:54 +01:00
Tomas Slusny 0b0ed6faeb Merge pull request #7554 from Rheon-D/overlay-config
Remove invalid OverlayMenuEntries
2019-01-25 20:17:26 +00:00
Tomas Slusny a474fd720f Limit only overlays that are not snapped
Limit only overlays that are layoutable/moveable but not in snap corner.

Closes #7087

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-25 17:32:01 +01:00
Tomas Slusny 35c8c3d562 Merge pull request #7538 from deathbeam/fix-left-click-overlays
Move menu entry nulling to BeforeRender
2019-01-25 09:29:34 +00:00
Tomas Slusny 1a65aa2c38 Merge pull request #7542 from unmrshl/kebos-hotcold-locations
Add 3 new Kebos clue spots to HotColdLocation.
2019-01-25 09:27:01 +00:00
Tomas Slusny bacccd3944 Merge pull request #7385 from Spedwards/feature/map-points
Add Rare Tree map points
2019-01-25 08:01:11 +00:00
Tomas Slusny c56ea05060 Send raid layout message on raid enter
Sends raid layout message as clan chat game message when entering raid.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-25 00:27:42 +01:00
Tomas Slusny d808baa3d3 Move ChatCommandsPlugin#sanitize to Text
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-25 00:19:42 +01:00
Tomas Slusny 1c88c93425 Add toRoomString and toCodeString Raid utilities
Add new util methods that will build room and code string from current
raid layout.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-25 00:19:42 +01:00
Tomas Slusny 93e4d13c31 Merge pull request #7544 from deathbeam/refresh-infoboxes-only-when-needed
Refresh infoboxes only when needed
2019-01-24 23:12:24 +00:00
Tomas Slusny 652bdb7341 Refresh infoboxes only when needed
Refresh infoboxes only when removeIf and remove actually removes
anything to avoid constant refreshing for no reason.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-24 21:47:05 +01:00
Tomas Slusny 34acc6fde2 Add anti-poison timers to anti-venom potions
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-24 21:39:42 +01:00
Tomas Slusny 7dfd5128ff Move menu entry nulling to BeforeRender
As render() and ClientTick rates are inconsistent (unless user has
50FPS, then they are same) the menu entries can flicker because
ClientTick will be called more often than render and so when frame is
skipped, menu entry is nulled and that causes flicker.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-24 17:36:42 +01:00
Tomas Slusny 7c5d8cccbb Merge pull request #7464 from deathbeam/cleanup-menu-entries
Cleanup overlay menu entry usage
2019-01-23 09:02:52 +00:00
Tomas Slusny ad40f8b50b Merge pull request #7497 from deathbeam/revert-closed
Revert "Move close handling to windowClosed event"
2019-01-23 07:36:51 +00:00
Tomas Slusny 538da43d68 Mark localToCanvas methods nullable
These can return null if object is not visible.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-22 19:20:10 +01:00
Tomas Slusny a7a42d5553 Null-check local location in trap overlay
Closes #7501

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-22 19:16:47 +01:00
Tomas Slusny 5b91d29186 Revert "Move close handling to windowClosed event"
This reverts commit b893e97ccf.
2019-01-22 08:00:22 +01:00
Tomas Slusny 90711882e0 Merge pull request #7483 from deathbeam/unify-splitters
Unify Splitter/Joiner usage (move to Text#toCSV and Text#fromCSV)
2019-01-21 12:37:39 +00:00
Tomas Slusny 272990041c Replace usage of Spliter/Joiner with toCSV/fromCSV
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-21 11:22:56 +00:00
Tomas Slusny 7badeb28be Add Text#fromCSV and Text#toCSV
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-21 11:17:52 +00:00
Tomas Slusny 69b09e057d Merge pull request #7435 from ChaoticConundrum/reset-confirm
ConfigPanel: Confirm plugin configuration reset
2019-01-21 09:29:33 +00:00
Tomas Slusny 239158f965 Merge pull request #7467 from jplsek/hop-no-message
world hopper: allow disabling chat hop message
2019-01-21 09:26:50 +00:00
Tomas Slusny c84b69b218 Merge pull request #7395 from Abextm/wasd-modifiers
Ignore modifiers in WASD plugin input
2019-01-21 06:58:13 +00:00
Tomas Slusny 5366aada8a Move overlay menu entries to Overlay class
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-20 23:25:32 +01:00
Tomas Slusny ac6f5af248 Remove overlayManager#overlayId
It is not used outside of OverlayManager so just swap it with direct use
of indexOf.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-20 23:25:31 +01:00
Tomas Slusny dedeb79e8b Remove OverlayManager#addMenu/removeMenu
removeMenu is completely unnecessary and addMenu does nothing.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-20 19:19:14 +01:00
Tomas Slusny b4de93d722 Merge pull request #7441 from deathbeam/fix-discord-ja
Wrap DiscordEventHandlers in native lib try/catch
2019-01-20 11:56:38 +00:00
Tomas Slusny a39441fff0 Change xp tracker filter clean to 3 hours
Change xp tracker username filter cleanup from 1 hour to 3 hours.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-20 04:39:41 +01:00
Tomas Slusny f8844d65a3 Do not discard 1 second requests in Xp tracker
Do not discard all requests excpect last one in 1 second internal in XP
tracker.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-20 04:32:37 +01:00
Tomas Slusny a13b86e4fd Wrap DiscordEventHandlers in native lib try/catch
Even construction of DiscordEventHandlers causes UnsatisfieldLinkError
on unsupported systems, avoid this.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-19 13:34:11 +01:00
Tomas Slusny 01fbcde008 Merge pull request #7426 from deathbeam/shutdown-plugins-on-close
Shutdown plugins on window close
2019-01-19 12:07:43 +00:00
Tomas Slusny fc200ee651 Merge pull request #7427 from deathbeam/flush-config-on-close
Move configManager.sendConfig to RuneLite#shutdown
2019-01-18 23:55:36 +00:00
Tomas Slusny 01c3bcafce Move configManager.sendConfig to RuneLite#shutdown
It should've been here in first place, there is no reason for it to be
in ClientUI.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-18 21:25:42 +01:00
Tomas Slusny b893e97ccf Move close handling to windowClosed event
This callback is called more reliably than windowClosing when killing
window from outside.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-18 21:20:14 +01:00
Tomas Slusny 6e080949f9 Shutdown plugins on window close
Closes #6646

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-18 21:11:00 +01:00
Tomas Slusny 73730f5861 Merge pull request #7406 from Hydrox6/game-notifications-custom-colour
Default colour won't change since both Game highlights are `#EF1020` by default

Examples alongside other Game type messages
![java_2019-01-17_16-56-34](https://user-images.githubusercontent.com/2979691/51335219-6935a880-1a79-11e9-93de-afcf59f60e9a.png)
![java_2019-01-17_16-56-50](https://user-images.githubusercontent.com/2979691/51335220-6a66d580-1a79-11e9-83d5-dc3a4401e473.png)
2019-01-18 14:17:28 +00:00
Tomas Slusny f4e2824a2a Merge pull request #7418 from ermalsh/clap_spin_karuulm_emote
Added missing "spin" emote after clap for Mt. Karuulm clue
2019-01-18 11:27:04 +00:00
Tomas Slusny 9b79ed9457 Merge pull request #7408 from deathbeam/inverse-inverse-and-inverse-pls
Inverse collapse menu entry loop
2019-01-18 11:25:44 +00:00
Tomas Slusny 32c8501b13 Merge pull request #7310 from DannysPVM/cap-fog-distance-gpu-plugin
Cap fog depth to 100 in the GPU Plugin.
2019-01-17 19:22:57 +01:00
Tomas Slusny 814277eb36 Inverse collapse menu entry loop
This makes sure that menu collapses to first entry because menu is built
in inverse. Before setting the entries, inverse them back to original
order.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-17 18:52:02 +01:00
Tomas Slusny 61bd2c906b Merge pull request #7375 from deathbeam/fix-size-thingy-canvas
Use client real dimensions for canvasTopRight
2019-01-16 20:11:44 +01:00
Tomas Slusny bf522eaba0 Use client real dimensions for canvasTopRight
Closes #7374

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-01-15 23:19:50 +01:00
Tomas Slusny a47c63e931 Merge pull request #7307 from deathbeam/remove-tags-loot
Remove tags from loot tracker box title
2019-01-15 12:31:12 +01:00
Tomas Slusny 558bf543ba Merge pull request #7355 from MagicfTail/Kebos-mappings
Add item mappings for items introduced in Kebos update
2019-01-14 23:12:18 +01:00