zeruth
769e1aa342
Merge branch 'upstream-master' into runelite
...
# Conflicts:
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
2021-01-25 00:21:50 -05:00
wrightmalone
49138527f8
xp globes: add option to show virtual level in tooltip
...
Co-authored-by: Adam <Adam@sigterm.info >
2021-01-24 19:30:19 -05:00
TheRealNull
0147abf768
project: upstream
2021-01-20 12:04:14 -08:00
Adam
b12860b52d
chat notifier: restore original color when highlighting own name
2021-01-19 13:04:01 -05:00
TheRealNull
a2a295a054
Merge remote-tracking branch 'upstream/master' into runelite
...
Also pulled out a couple of our merged apis into our own classes. Getting much easier to keep up to date with their data
# Conflicts:
# .github/FUNDING.yml
# .github/workflows/CI.yml
# cache-client/pom.xml
# cache-updater/pom.xml
# cache/pom.xml
# cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
# ci/build.sh
# http-api/pom.xml
# http-service/pom.xml
# http-service/src/main/java/net/runelite/http/service/chat/ChatController.java
# http-service/src/main/java/net/runelite/http/service/config/ConfigController.java
# http-service/src/main/java/net/runelite/http/service/config/ConfigService.java
# http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java
# http-service/src/main/java/net/runelite/http/service/ge/Trade.java
# http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java
# http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
# pom.xml
# runelite-api/pom.xml
# runelite-api/src/main/java/net/runelite/api/Client.java
# runelite-api/src/main/java/net/runelite/api/ObjectID.java
# runelite-api/src/main/java/net/runelite/api/ParamHolder.java
# runelite-api/src/main/java/net/runelite/api/ParamID.java
# runelite-api/src/main/java/net/runelite/api/Preferences.java
# runelite-api/src/main/java/net/runelite/api/ScriptEvent.java
# runelite-api/src/main/java/net/runelite/api/ScriptID.java
# runelite-api/src/main/java/net/runelite/api/SettingID.java
# runelite-api/src/main/java/net/runelite/api/StructComposition.java
# runelite-api/src/main/java/net/runelite/api/StructID.java
# runelite-api/src/main/java/net/runelite/api/Varbits.java
# runelite-api/src/main/java/net/runelite/api/events/PlayerChanged.java
# runelite-api/src/main/java/net/runelite/api/events/PostStructComposition.java
# runelite-api/src/main/java/net/runelite/api/events/WidgetClosed.java
# runelite-api/src/main/java/net/runelite/api/events/WidgetHiddenChanged.java
# runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
# runelite-api/src/main/java/net/runelite/api/events/WorldChanged.java
# runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java
# runelite-api/src/test/java/net/runelite/api/plugins/combatlevel/CombatLevelOverlayTest.java
# runelite-client/pom.xml
# runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
# runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
# runelite-client/src/main/java/net/runelite/client/plugins/config/PluginToggleButton.java
# runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
# runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
# runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
# runelite-client/src/main/resources/net/runelite/client/runelite.properties
# runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
# runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/discord/DiscordStateTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
# runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java
# runelite-script-assembler-plugin/pom.xml
2021-01-14 14:41:17 -05:00
Adam
4a214f9807
spec counter: add spec threshold notifications
...
This allows configuring spec thresholds which a notification will be sent for
when reached. Additionally it colors the infobox text red or green based on if
the threshold has been reached.
Co-authored-by: Dylan <dylanhe@gmail.com >
Co-authored-by: jgozon <47003557+jgozon@users.noreply.github.com >
2021-01-08 16:20:40 -05:00
Adam
fd9626495b
client: bind runelite.properties to guice
2020-12-30 16:32:23 -05:00
Adam
ffebb9cf0c
ge plugin: better handle trades updating on login
...
After login there are two sets of offer updates, I suspect the first is
from the server and the second is from the ge server - this also flags
ge server trade updates as on login. To do this we assume it always
happens in the first few ticks after the login burst.
2020-12-25 19:19:39 -05:00
Mrnice98
0c2f93d11c
timers: use chat message for sire stun timer
...
This makes the timer work more reliably when stuns are stacked
2020-12-24 00:54:30 -05:00
pilino1234
ab4cf1afe9
Add alpha channel to color config options where applicable
2020-12-20 00:01:32 -05:00
therealunull
b54ff7f7db
openrune: just about finish rework, gets to login
2020-12-13 15:12:37 -05:00
Adam
f67eed0f96
chatcommands: always apply pb from raids
...
This logic was from prior to cox having a pb message, and so it had to compare
the known pb with the current raid duration. Now that all raids have a pb
message, it is no longer necessary to do this. This fixes pb times syncing up
in the main game correctly that were overwritten by leagues.
2020-12-07 23:34:02 -05:00
Adam
f0233234da
chat commands test: remove unnecesary argument matchers
2020-12-04 16:01:50 -05:00
Adam
3771444b7f
chat commands: fix detecting pb when completing leagues tasks
...
The league task message is in between the kc and pb messages, so just look for the pb message on the same tick as the kc message
2020-12-04 15:50:21 -05:00
Adam
16149cdcae
config manager: manually parse config keys
...
The regex used took too long to complete with large inputs that can
appear when the user has a corrupted config.
2020-12-02 19:26:13 -05:00
Adam
23b7a65c29
chatfilter: fix filtering self and clan messages with chat icons
...
This was incorrectly filtering self/clan messages from players with chat
icons due to not stripping the icon tag before matching the player name.
2020-11-27 15:32:51 -05:00
Max Weber
f078717822
runelite-client: add rsprofile support
2020-11-25 22:29:35 -07:00
Adam
6f60750c31
combat level: show next levels needed even past 99
...
In some cases, it is not possible to get a combat level solely from leveling
any one stat. If this happened previously the overlay would show an empty
tooltip due to the levels required all being >99. This just shows the levels
required even if it surpasses 99.
2020-11-21 10:40:18 -05:00
Owain van Brakel
7e70885284
Merge remote-tracking branch 'runelite/master'
2020-11-17 04:46:44 +01:00
Jacob Buckheit
661aca8475
chat notifier: fix matching messages with included punctuation
...
The punctuation is not in \b or \s, so additionally include \z. Also
added \A for the beginning, which would have the same problem, which the
test also tests for.
Co-authored-by: Adam <Adam@sigterm.info >
2020-11-16 16:28:45 -05:00
Adam
811842ef2f
wildcard matcher: quote replacement to prevent the matcher from replacing group references
2020-11-09 19:15:28 -05:00
Adam
3a1e752da5
item charges test: remove unnecessary eq matchers
2020-11-04 15:35:29 -05:00
Unmoon
f17a08ff9d
item charges: add Chronicle
2020-11-04 15:35:29 -05:00
Matthew Zegar
43bf4d60eb
key remapping: add control remap
...
Co-authored-by: Adam <Adam@sigterm.info >
2020-11-03 16:06:28 -05:00
Adam
7ceb3c9e02
client: add PMD source code analyzer
...
This catches common bugs, dead code, etc., and also performs some more advanced
code style checks compared to checkstyle.
Co-authored-by: pilino1234 <pilino@posteo.de >
2020-11-01 11:54:54 -05:00
Adam
d3c0713969
key remapping: don't remap space in options dialog
...
The options dialog never accepts space, so remapping a key to it doesn't make sense, and it is possible the original key was one of the keys actually being listened for
2020-10-30 14:44:20 -04:00
Owain van Brakel
0677ccdda4
Merge remote-tracking branch 'runelite/master' into master
2020-10-29 17:28:59 +01:00
Jordan
d70003448c
Merge pull request #11765 from Plondrein/motherlode-broken-wheel
...
motherlode: Add overlay for broken water wheel struts
2020-10-24 19:45:31 -07:00
Plondrein
1c21d0671e
motherlode: Add overlay for broken water wheel struts
...
* Rename MotherlodeRocksOverlay to MotherlodeSceneOverlay
* When strut is broken, red border with hammer icon will show around it.
2020-10-24 19:35:40 -07:00
paymon123
03566d6702
ConfigManager: Fix NPE when resetting configs with null default
2020-10-24 22:52:44 +02:00
Matthew C
5a863f358f
discord: Fix action timeout, add in game time elapsed option ( #12471 )
...
Co-authored-by: Matthew C <66925241+Matthew-nop@users.noreply.github.com >
Co-authored-by: Tomas Slusny <slusnucky@gmail.com >
Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com >
2020-10-24 02:56:35 +02:00
Owain van Brakel
1cf50d54b1
project: Merge upstream
2020-10-21 12:57:38 +02:00
SirGirion
274df60d3c
timetracking: add compost bin time trackers ( #12619 )
2020-10-19 19:46:14 -06:00
Abex
736e649e24
Merge pull request #12621 from Nightfirecat/kourend-library-varlemore-envoy-fix
...
kourendlibrary: Don't reset state when not finding Varlamore Envoy
2020-10-18 16:30:01 -06:00
Adam
a2d693fc74
chat commands: unregister bh and lms commands
2020-10-16 13:06:34 -04:00
Jordan
67ecfc3cfa
Merge pull request #12130 from Cyborger1/contract-overlay-fix-12124
...
Check diseased and dead states on the Farming Contract Indicator
2020-10-12 13:07:17 -07:00
Cyborger1
6d78e6884d
farming: Fix contract status for plots with diseased/dead crops
...
This commit fixes the farming contract manager's behavior when
encountering crops which have become diseased. Previously, it would not
take this into account and incorrectly report the crop as IN_PROGRESS or
READY.
2020-10-08 19:52:02 -07:00
Jordan Atwood
d0589c80b9
kourendlibrary: Don't reset state when not finding Varlamore Envoy
...
The Varlamore Envoy is a quest item which, while having a known location
in the library once a rotation is determined, cannot be found under
certain circumstances. (when the Depths of Despair quest has not been
started, has been collected while completing the quest, and after the
quest is completed) Previously searching a bookcase which could contain
this book and not finding it would cause a state reset. This commit
keeps those null finds from resetting the known library state.
2020-10-08 14:09:06 -07:00
Jack Hodkinson
1ce0474336
Sort plugin search results with closer test matches higher ( #12432 )
2020-10-05 02:18:16 -06:00
Jordan Atwood
d9876976d6
util: Remove unused and unneeded methods
...
ImageUtil had previously provided a number of image fill and outline
methods which accepted Predicates to control the fill and outline
behavior, but they are not used anywhere in the client or by external
plugins. This commit removes these methods and the
is(Not)?FullyTransparent ColorUtil methods which existed solely as
Predicate defaults for them.
2020-10-03 12:06:52 -04:00
Adam
1799c9e593
loottracker: submit loot when not logged in
...
This is to aid the wiki drop log project. The data is not otherwise
stored.
2020-10-01 18:31:39 -04:00
Adam
475e463692
Merge pull request #12472 from Nightfirecat/fix-experience-tests-location
...
Move Experience tests to proper test class
2020-09-30 17:18:19 -04:00
Adam
c774117d93
loot tracker: fix tracking grubby chest
...
Co-authored-by: Jonathan Lee <cookmeplox@weirdgloop.org >
2020-09-28 20:16:33 -04:00
SirGirion
f01dce648a
loot tracker: add bird houses
2020-09-27 12:36:10 -04:00
Adam
908c6b4fe4
infobox: add support for multiple infobox groups
...
Co-authored-by: Ron Young <admin@ryoung.io >
2020-09-27 10:20:14 -04:00
Adam
9c362fb836
containable frame: assume jdk 12/13/14 do not have fix for JDK-8231564
...
These versions are EOL, and although greater than 11, do not include JDK-8231564
2020-09-24 18:44:54 -04:00
Jordan
6895ed54da
Merge pull request #12430 from usa-usa-usa-usa/feature/update-tzhaar-timer
2020-09-20 21:53:35 -07:00
Adam
62a69b94c5
containableframe: fix parsing Oracle Java 8 version string
2020-09-20 16:46:08 -04:00
jcwhisman
2c2c013cba
timers: Fix inferno timer starting time
2020-09-14 08:07:04 -05:00
jcwhisman
43c5e1f916
ElapsedTimer: Display time in mm:ss format
2020-09-09 17:38:03 -07:00