Commit Graph
100 Commits
Author SHA1 Message Date
Tomas Slusny 4a0593c11b Merge pull request #6038 from deathbeam/make-zeah-mess-hall-widget-la
Make Zeah Mess Hall display layoutable
2018-10-16 12:58:54 +02:00
Tomas Slusny 48b1fa5d06 Make Zeah Mess Hall display layoutable
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-16 12:45:52 +02:00
Tomas Slusny 0c3f75cfbc Merge pull request #6037 from deathbeam/tag-placeholders
Unify calls for getting real item id for bank tag
2018-10-16 12:37:44 +02:00
Tomas Slusny 532a2cd6d2 Unify calls for getting real item id for bank tag
Instead of trying to tag and find notes and placeholders, find real item
ids.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-16 11:51:46 +02:00
Tomas Slusny 3cec6f2a4c Merge pull request #6024 from deathbeam/tag-tabs-import-export
Add ability to import/export tag tabs with clipboard
2018-10-16 11:40:39 +02:00
Tomas Slusny 57a198d3f2 Merge pull request #4465 from deathbeam/add-username-to-title
Add toggle for displaying username in title
2018-10-16 09:07:34 +02:00
Tomas Slusny 337e35c400 Merge pull request #3641 from deathbeam/use-terminal-notifier-if-available
Use terminal-notifier when available for OSX
2018-10-15 23:45:55 +02:00
Tomas Slusny 5db0d3806b Use terminal-notifier when available for OSX
This will allow for icons for OSX notifications and its usually pretty
standard library to have. Also allows grouping of notifications and
click-to-activate.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-15 22:07:58 +02:00
Tomas Slusny 5cd32c17c6 Add ability to import/export tag tabs with clipboard
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-15 17:43:35 +02:00
Tomas Slusny b071f8c9a3 Merge pull request #5990 from deathbeam/overlay-font
Add option to choose interface (layoutable) overlay font
2018-10-15 10:36:47 +02:00
Tomas Slusny fbe5421f6a Merge pull request #6023 from forsco/revert-5989
Revert #5989
2018-10-15 10:35:47 +02:00
Tomas Slusny c54eded215 Merge pull request #6011 from mattec92/fix/hot-cold-clue-location
Fix ASGARNIA_MIAZRQA Hot-Cold clue location.
2018-10-14 18:38:25 +02:00
Tomas Slusny 3b389c7266 Merge pull request #6003 from deathbeam/make-cryptics-robust
Make 3 step cryptic clues more robust
2018-10-14 18:37:13 +02:00
Tomas Slusny 72bf82348a Fix punctionation in "Fiendish cooks" cryptic clue
Closes #5968

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 18:13:59 +02:00
Tomas Slusny 636aa2f079 Null-check location for multi-location clues
Sometimes it can be null.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 18:13:59 +02:00
Tomas Slusny ecfcd6d67b Make 3 step cryptic clues more robust (better splitting)
- Instead of depending on specific formatting and size of clue text, just
split and parse everything stripping all tags when needed.
- Exit early on size < 3 to prevent NPEs and ArrayOutOfBounds

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 18:13:39 +02:00
Tomas Slusny fb1c2f4b02 Merge pull request #6001 from NathenSample/debugClues
Log error when encountering an unmatched clue string
2018-10-14 14:30:26 +02:00
Tomas Slusny 6236ba0de2 Merge pull request #5992 from deathbeam/discord-raids
Add raiding activity to Discord plugin
2018-10-14 02:59:52 +02:00
Tomas Slusny ba30827e77 Merge pull request #6000 from trimbe/cryptic-clue-fix
Fix lava maze dungeon cryptic clue
2018-10-14 02:37:55 +02:00
Tomas Slusny 631e3e7c4f Add raiding activity to Discord plugin
- Add support for Varbit triggers to Discord plugin
- Add Chambers Of Xeric and Theatre of Blood to Discord plugin
- Put these two to separate category because according to wiki they are
separate

Closes #4223
Closes #4224

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-14 01:47:25 +02:00
Tomas Slusny 7c67445bf8 Merge pull request #5995 from deathbeam/sort-options-by-name-as-well
Sort config panel options by name as well
2018-10-14 00:37:31 +02:00
Tomas Slusny a8f42ab007 Sort config panel options by name as well
In addition to sorting config panel options by position, sort them also
by name to remove need of setting positions everywhere for consistent
order.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 23:13:18 +02:00
Tomas Slusny 3c1f841510 Add toggle for displaying username in title
Closes #1918

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 22:24:38 +02:00
Tomas Slusny bbd9667304 Merge pull request #4805 from ConnorVG/discord-raids-mlm-events
DiscordPlugin: Add MLM
2018-10-13 21:43:39 +02:00
Tomas Slusny 0ca38735d2 Add option to choose interface (layoutable) overlay font
Closes #1716

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 19:31:07 +02:00
Tomas Slusny 4f5fb62667 Merge pull request #5982 from deathbeam/skill-lookup-varbit
Move local player hiscore type check to client thread
2018-10-13 19:26:29 +02:00
Tomas Slusny d42ceeb98c Merge pull request #5981 from deathbeam/varbit-stuff
Move ChatMessageManager#refreshAll to client thread
2018-10-13 18:23:06 +02:00
Tomas Slusny 01ce193e9c Merge pull request #5986 from ellscape/mystic-mist-buy-limit
Mystic Mist Staff buy limit corrected from 6 to 8
2018-10-13 14:57:09 +02:00
Tomas Slusny 8759423f07 Move local player hiscore type check to client thread
Closes #5896

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 12:05:01 +02:00
Tomas Slusny 71091d4aae Move ChatMessageManager#refreshAll to client thread
Closes #5897

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-13 11:58:05 +02:00
Tomas Slusny 9828dd047a Merge pull request #5898 from deathbeam/fix-corrupted-settings
Implement locking and corrupted file sanitization to ConfigManager
2018-10-13 11:54:15 +02:00
Tomas Slusny 189e59e972 Merge pull request #5975 from Nightfirecat/combat-bracelet-slayer-update
slayer: Add combat bracelet task update handling
2018-10-13 03:15:07 +02:00
Tomas Slusny b77fbc1f8c Merge pull request #5967 from Nightfirecat/simulate-npc-spawns
GameEventManager: Simulate Actor spawn events
2018-10-13 00:50:21 +02:00
Tomas Slusny ceb85907a5 Merge pull request #5973 from deathbeam/widget-bounds-limit
Limit widget overlay bounds to parent
2018-10-12 23:59:00 +02:00
Tomas Slusny 176ac567b5 Limit widget overlay bounds to parent
Add limiting of widget overlay bounds to parent bounds in order to not
get out of sync with actual overlay position and drawn overlay position.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 22:39:22 +02:00
Tomas Slusny a61afb2f0c Merge pull request #5969 from deathbeam/swap-stuff
Disable bury and harpoon swaps by default
2018-10-12 21:42:32 +02:00
Tomas Slusny 307fe9e1c7 Merge pull request #5965 from deathbeam/quick-pass
Properly reorder menu entry config & add swaps for quick pass/travel/start
2018-10-12 21:15:00 +02:00
Tomas Slusny 5558b6bf03 Disable bury and harpoon swaps by default
Even though the swapper plugin is disabled by default, many people
enable it and these defaults are very niche and annoying in some
scenarios.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 20:26:33 +02:00
Tomas Slusny 61d08d54a6 Add quick pass/travel/start menu entry swapping
Closes #2226
Closes #1459

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 20:25:04 +02:00
Tomas Slusny 8b40f71c41 Merge pull request #5640 from deathbeam/bounty-hunter-layoutable
Make bounty hunter stats widget layoutable
2018-10-12 20:15:30 +02:00
Tomas Slusny 643a89223c Reorder menu swaps again by name
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 18:49:05 +02:00
Tomas Slusny 33954ccf67 Lock configuration file when writing to filesystem
Use OS-wide exclusive lock when writing configuration file to filesystem
to prevent config file corruption when multiple concurrent writers try
to write to same config file at same time.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 16:41:13 +02:00
Tomas Slusny 85c9ec890b Use UTF-8 instead of ISO 8859-1 when loading/saving config
In order to prevent failures on reading/writing incorrectly escaped
characters or writing special UTF-8 characters on save as gibberish,
explicitly specify UTF-8 encoding when loading and writing properties.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 16:41:13 +02:00
Tomas Slusny 4a5e4491c9 Remove invalid properties from map on property load
In order to not have config file flooded with invalid and corrupted
properties in case of file corruption, remove all these invalid
properties from property map on configuration load.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 16:41:13 +02:00
Tomas Slusny b0fbc09013 Merge pull request #5960 from deathbeam/fix-kraken-boss
Fix cave kraken boss task name
2018-10-12 15:20:02 +02:00
Tomas Slusny b14c0726b8 Add optional "the" when checking slayer task progress message
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 14:30:13 +02:00
Tomas Slusny 0b87e2e8f9 Fix cave kraken boss task name
Closes #5958

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 13:31:33 +02:00
Tomas Slusny 400d34d563 Merge pull request #5873 from raiyni/recent-chats
Add recent clan chats to clan chat plugin
2018-10-12 10:41:55 +02:00
Tomas Slusny 417991210a Merge pull request #5907 from deathbeam/fix-slayer-counter
Correctly parse slayer task with the and breaks in npc name
2018-10-12 10:23:49 +02:00
Tomas Slusny 3a340fc2d1 Merge pull request #5949 from deathbeam/remember-tag-tab
Add option to remember last opened tag tab
2018-10-12 09:09:29 +02:00
Tomas Slusny 429e7b53ac Merge pull request #5946 from Nightfirecat/remove-deprecated-farming-config-migration
time tracking: Remove deprecated config migration
2018-10-12 08:19:47 +02:00
Tomas Slusny e9fdd5b6a4 Merge pull request #5905 from deathbeam/raid-scouter-simplify
Move raid scouter layout to title
2018-10-12 08:01:21 +02:00
Tomas Slusny 45fa78ce28 Merge pull request #5910 from raiyni/search-limit
Don't limit bank search and title explicitly to 15 characters
2018-10-12 07:58:59 +02:00
Tomas Slusny e93ba9d51f Merge pull request #5947 from deathbeam/gout-tuber-heal
Add Gout Tuber heal info to Item Stats plugin
2018-10-12 00:42:37 +02:00
Tomas Slusny 8318e42589 Merge pull request #5944 from deathbeam/fix-patches-naming
Remove duplicate "Patches" from time track overview
2018-10-12 00:13:28 +02:00
Tomas Slusny 2ce79b1ae8 Add option to remember last opened tag tab
Closes #5936

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-12 00:05:01 +02:00
Tomas Slusny 11cef7d0a1 Add Gout Tuber heal info to Item Stats plugin
It heals 12 hp.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 23:46:46 +02:00
Tomas Slusny da35086a13 Remove duplicate "Patches" from time track overview
Closes #5943

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 21:27:44 +02:00
Tomas Slusny 150737d18b Merge pull request #5935 from Kamielvf/raidsoverlay-fix
Fix raid scout overlay not rendering at bank
2018-10-11 20:09:30 +02:00
Tomas Slusny bdcb1ea444 Merge pull request #5926 from deathbeam/fix-equipment-checks
Do not reset equipment/inventory in clues croll plugin each tick
2018-10-11 20:06:12 +02:00
Tomas Slusny 114cd0c5b9 Merge pull request #5934 from raiyni/fix-changeicon
Don't fetch itemid of Change Icon menu option on tabs
2018-10-11 20:05:17 +02:00
Tomas Slusny 728e1c40c0 Do not reset equipment/inventory in clues croll plugin each tick
Because it is now updated from changed events, this will simply make the
item reqs not work.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 14:42:16 +02:00
Tomas Slusny f82c984973 Merge pull request #5915 from deathbeam/fix-tabs
Properly reset search when deleting active tag tab
2018-10-11 00:37:58 +02:00
Tomas Slusny 2b71a13049 Properly reset search when deleting active tag tab
Closes #5913

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-11 00:18:18 +02:00
Tomas Slusny 8d7e569b19 Merge pull request #5906 from raiyni/tag-bugs
Fix tags resetting when bank window is closed and active tab matching for long tags
2018-10-10 22:11:57 +02:00
Tomas Slusny e7d556bc92 Merge pull request #5908 from deathbeam/bank-tags-use-const
Use TAG_SEARCH const instead of hardcoding "tag:" in Bank Tags
2018-10-10 18:52:48 +02:00
Tomas Slusny 76086e421f Use TAG_SEARCH const instead of hardcoding "tag:" in Bank Tags
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-10 18:44:52 +02:00
Tomas Slusny f6588ae3ba Correctly parse slayer task with the and breaks in npc name
This fixes e.g chaos elemental task assignment.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-10 17:34:33 +02:00
Tomas Slusny 14bd67c465 Move raid scouter layout to title
- Remove "Raid scouter" title
- Move raid layout to title instead

This change is because the raid scouter is quite big and now that it can
be persisted after raid starts, it is a bit annoying in fixed mode.
Also, the title is effectively useless as it is visible only in raid and
it is quite obvious what is it.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-10 15:56:35 +02:00
Tomas Slusny 6c739998c1 Merge pull request #5351 from raiyni/tag-tabs
Add tag tabs to bank tags plugin
2018-10-09 22:22:25 +02:00
Tomas Slusny 7bb5dc470c Add method for standardizing text input to Text
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-09 21:31:00 +02:00
Tomas Slusny 445b6c8e6f Merge pull request #5704 from deathbeam/add-logging-for-executor
Add executor service logger that logs exceptions
2018-10-09 08:07:03 +02:00
Tomas Slusny 61fda35945 Remove unnecessary calls to RunnableExceptionLogger
As all submitted tasks are now wrapped in this class automatically,
manual wrapping is no longer necessary.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-09 07:57:44 +02:00
Tomas Slusny 1f8ce36688 Add executor service logger that logs exceptions
By default, executor service eats all exceptions and forwards them to
failed futures, so in order to actually see what happened one must check
the resulting future, what is not ideal. Instead, log every exception
from scheduled service using slf4j logger.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-09 07:56:10 +02:00
Tomas Slusny b5711eae58 Merge pull request #5879 from Kamielvf/regen-meter-stroke
Change regen meter stroke end-cap style to CAP_BUTT
2018-10-09 07:54:57 +02:00
Tomas Slusny 2c13aea624 Merge pull request #5880 from Kamielvf/chatbox-snapcorner-fix
Fix snapped overlays above chatbox not being rendered
2018-10-08 20:28:25 +02:00
Tomas Slusny 82bb383883 Merge pull request #5870 from Nightfirecat/dont-show-tooltips-for-world-map-dungeons
mouse tooltips: Don't add a tooltip if another is present
2018-10-08 10:31:44 +02:00
Tomas Slusny 27434ebc43 Merge pull request #5832 from deathbeam/fix-loot-tracker-entries
Skip empty spots in Loot Tracker when getting items
2018-10-08 08:54:41 +02:00
Tomas Slusny 5a33d2b093 Merge pull request #5847 from deathbeam/fix-npe-in-miscellania
Fix NPE in Miscellania plugin on DC
2018-10-06 15:21:26 +02:00
Tomas Slusny 9c1046e341 Merge pull request #5648 from deathbeam/optimize-clue-scrolls
Optimize clue scrolls
2018-10-06 09:44:34 +02:00
Tomas Slusny a72b137a9e Remove clue scroll timeout
It is not even working anymore because when clue dissapears from
inventory clue is just reset.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:23:57 +02:00
Tomas Slusny 6e417ba6d9 Correctly highlight ObjectClueScroll for single location
This is regression by PR that introduced 3 step cryptic clues, as check
for highlighting single object was removed.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:23:57 +02:00
Tomas Slusny db815daab2 Do not set hint arrows for object clue scroll
As it is set in check for LocatioClueScroll it is not necessary to set
it also in object clue scroll check.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:23:57 +02:00
Tomas Slusny 108050a805 Inverse findClueScroll conditions
For better readability, change the big if blocks in findClueScroll()
method to early returns instead.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:23:57 +02:00
Tomas Slusny 255ce8ed91 Move clue inventory/equipment assignment to ItemContainerChanged
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:23:57 +02:00
Tomas Slusny 19bd40f7bb Use NpcSpawned/Despawned events for checking clue NPCs
- Use NpcSpawn/Despawn events to set npcs to mark and hint arrow
- When setting location hint arrows, check if NPC hint arrow for clue
NPC is not already set

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:23:48 +02:00
Tomas Slusny 2732188c89 Fix NPE in Miscellania plugin on DC
When you DC, isInKingdom throws NPE in isInKingdom method because
localPlayer is null.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-06 09:20:05 +02:00
Tomas Slusny 64496c0113 Merge pull request #5833 from MagicfTail/Fix-wiki-link
Update osrs wiki link
2018-10-06 09:10:42 +02:00
Tomas Slusny 28a0c380d4 Merge pull request #5835 from MagicfTail/0-raid-counter
Stop CoX party size from showing before varb is loaded
2018-10-06 09:10:24 +02:00
Tomas Slusny 21f8883b72 Skip empty spots in Loot Tracker when getting items
Skip all empty spots in ItemContainer#getItems array by checking if
itemId > 0.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-05 19:19:10 +02:00
Tomas Slusny 1a1c83dd3c Move map clue checking to MenuOptionClicked
Closes #4607

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-05 18:26:24 +02:00
Tomas Slusny 2c29924891 Merge pull request #5816 from GravitySalad/additional-tags
Add additional search tags for interface styles and pvm plugins
2018-10-05 12:40:55 +02:00
Tomas Slusny 7c4e53d9ae Merge pull request #5761 from MagicfTail/Yellow-boost
Add support for making the boost colour yellow if below boost threshold
2018-10-05 11:52:53 +02:00
Tomas Slusny 56abf7414b Fix Raids plugin varbit access not happening on client thread
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2018-10-05 11:39:01 +02:00
Tomas Slusny 28edd364a8 Merge pull request #5603 from SebastiaanVanspauwen/2005-interface
Interface plugin: Added 2005 chatbox
2018-10-05 11:14:45 +02:00
Tomas Slusny 6b5c0d719c Merge pull request #5784 from NathenSample/fix/DontUseNF
Improve readability of stackformatter tests
2018-10-05 10:51:28 +02:00
Tomas Slusny ef5af081f9 Merge pull request #5786 from psikoi/xp-globes-color
Add default skill color to XP globes
2018-10-05 10:48:26 +02:00
Tomas Slusny ece2ae41f4 Merge pull request #5775 from Abextm/timetracking-overview
timetracking: Show overview completion by tab, not implementation
2018-10-05 10:26:54 +02:00
Tomas Slusny d155880d56 Merge pull request #5803 from forsco/burthorpe-discord-presence
Fix Burthorpe spelling in Discord Rich Presence
2018-10-04 14:59:24 +02:00
Tomas Slusny 13a85f39ea Merge pull request #5738 from MagicfTail/clueexamine
Add support for examine price to clue scroll reward
2018-10-03 10:41:03 +02:00