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
266fee2067
config service: handle fromJson() returning null
...
Treat it the same as handling a json syntax exception
2021-01-09 17:12:05 -05:00
Adam
0f17ecdaea
http-api: add soul wars hiscores
2021-01-06 15:27:07 -05:00
Adam
e3b75c8b7a
ge: submit buy limit reset time
2020-12-25 19:58:22 -05:00
Adam
9a322c70d0
ge: add trade seq number
...
Occasionally the trades are delivered out of order, this allows us to reassemble them in the correct order
2020-12-25 19:19:41 -05:00
Adam
2c8984e380
ge: add user agent to trade message
2020-12-25 19:19:40 -05:00
Adam
f6a5463a57
Merge pull request #12834 from abextm/rsprofile-external
...
Per RuneScape-Profile configuration
2020-11-27 00:00:54 -05:00
Adam
0ca25d4f46
chat controller: return 404 if task is not found
...
This was returning a 200 with an empty body, causing the client to npe due to deserializing it as a Task with no task or location
2020-11-26 14:37:50 -05:00
Max Weber
e769ee0a7b
http-api, http-service, rl-client: bulk upload configuration changes
2020-11-25 22:29:35 -07:00
Adam
4f3d57d739
Fix offline worlds showing population of 65535
...
The service has been updated to return -1 when worlds are offline, and then the UI updated to display OFF when the count is less than 0
2020-11-09 12:41:50 -05:00
Adam
9fc8f19c32
pluginhub controller: fix scheduled task delay
...
This was meant to be 30 minutes
2020-10-21 10:20:47 -04:00
Adam
7a6c4ecc51
Add pluginhub user count tracking
2020-10-17 11:50:53 -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
Max Weber
431e09588b
specify utf8 encoding
...
this should fix the following known bugs:
- putting a U+2019 in the config causes it to become corrupted and
~double in size every launch
- scripts become assembled incorrectly and the nbsp after your name in
the chatbox becomes incorrect
- the feed panel doesn't show emoji
2020-08-28 21:58:08 -04:00
Adam
9c81e9b509
http-service: increase loot tracker retention to 90 days
2020-08-22 11:09:07 -04:00
Adam
86713e66ee
loot tracker service: use bigint for kill id
2020-08-15 18:48:57 -04:00
Adam
47c375cb03
client: use guice provided http client everywhere
2020-06-27 23:21:28 -04:00
Adam
a1122ba141
ge: fix computing bought/sold amount
...
Use the total spent price instead of the delta spent price, as it is
being divided by the total quantity
2020-06-06 10:35:20 -04:00
Adam
2dd6fa41e9
ge: include both delta qty and qty
2020-06-04 10:14:01 -04:00
Adam
a803ba567b
ge: include slot id
2020-06-03 20:44:45 -04:00
Adam
c67378c09e
ge plugin: include if trade is synced on login
2020-06-01 09:56:09 -04:00
Adam
83756e8722
ge: submit spent price instead of computed per-item price
2020-06-01 09:56:09 -04:00
Adam
7675f92ee5
ge controller: add total to trade message
2020-05-31 11:48:27 -04:00
Adam
6a2e15643f
ge plugin: include world type in trades
2020-05-30 20:06:33 -04:00
Adam
44ea837346
ge controller: publish trade data to redis
2020-05-30 19:26:43 -04:00
Adam
17d6921a4a
ge plugin: submit partially completed trades
2020-05-30 19:26:43 -04:00
Adam
2622cc2ac6
http-api: use separate class for ge trade history
2020-05-30 19:26:43 -04:00
Adam
d25546f5db
Add dmmt world type and tournament hiscore endpoint
2020-05-01 10:25:50 -04:00
Adam
670e62b6b9
item service: remove old item searching and item lookup methods
...
We haven't used this code in awhile. Additionally modify the price
crawler to re-fetch known items in the event the name or examine
changes.
2020-04-07 16:09:30 -04:00
Adam
e03cc3c19d
feed controller: return service unavailable if feed isn't loaded
2020-03-26 10:43:17 -04:00
Adam
b0a7e779be
world controller: return service unavailable if world list isn't loaded
2020-03-26 10:42:54 -04:00
Adam
c930a5d261
http-api: add world region to World
...
Add a WorldRegion to convert from location id to region
Co-authored-by: melkypie <melkypie@users.noreply.github.com >
2020-03-24 11:54:54 -04:00
dekvall
976ecd8f6b
hiscores: add nightmare boss
2020-02-13 07:13:12 +01:00
Adam
9cf95ef324
http-service: increase ge history retention to 90 days
2020-02-11 17:30:21 -05:00
Adam
4d5857214e
loot tracker: add pickpocket events
...
Co-authored-by: Daniel Cimento <daniel.cimento@mail.mcgill.ca >
2020-02-10 18:27:01 -05:00
Adam
2310349a44
loot controller: publish loot to redis
2020-01-18 21:56:56 -05:00
Adam
97b4f0d56f
loot tracker: store aggregated drops
...
This modifies both the service and the client plugin to no longer store
loot per-kill, with the exception of the current sessions kill log. The
amount of loot data returned now from the service defaults to the last
1024 unique events
2020-01-18 21:56:56 -05:00
TheRealNull
bdf9013864
project: remove modules to be externalized
2020-01-15 03:52:51 -05:00
Owain van Brakel
dfaf72eb35
Merge remote-tracking branch 'runelite/master' into ready-set-action
...
Conflicts:
.gitignore
cache-client/pom.xml
cache-updater/pom.xml
cache/pom.xml
cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java
deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java
http-api/pom.xml
http-service/pom.xml
http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
pom.xml
protocol-api/pom.xml
protocol/pom.xml
runelite-api/pom.xml
runelite-api/src/main/java/net/runelite/api/Client.java
runelite-client/pom.xml
runelite-client/src/main/java/net/runelite/client/RuneLite.java
runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
runelite-client/src/main/java/net/runelite/client/rs/CountingInputStream.java
runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java
runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
runelite-client/src/main/java/net/runelite/client/util/CountingInputStream.java
runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
runelite-client/src/main/resources/net/runelite/client/runelite.properties
runelite-client/src/main/resources/npc_health.json
runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
runelite-script-assembler-plugin/pom.xml
2020-01-09 19:59:46 +01:00
Adam
faacbc4160
feed controller: catch any exception when fetching newes sources
2020-01-09 10:32:50 -05:00
Hydrox6
90ce907ade
hiscore api: add Callisto and Cerberus
2020-01-06 13:52:43 +00:00
Adam
9ae4e772a4
http-api: update for boss hiscores
...
This leaves Callisto and Cerberus commented out as they are currently
not being returned by the hiscores
2019-12-08 20:43:48 -05:00
Owain van Brakel
594d141d9b
Merge remote-tracking branch 'runelite/master'
2019-11-28 21:31:34 +01:00
Adam
c117bc9bd5
chat controller: limit layouts to 16 rooms
2019-11-25 13:07:22 -05:00
Owain van Brakel
0f9d3c7718
Merge remote-tracking branch 'runelite/master'
2019-11-18 01:47:30 +01:00
Lucwousin
b7bd7c5a08
{} where allowed
2019-11-16 04:51:03 +01:00
Lucwousin
55b0845a18
Optimize imports
2019-11-16 04:51:03 +01:00
Adam
7463d2de1a
api: add league world type
...
Co-authored-by: Hydrox6 <ikada@protonmail.ch >
2019-11-15 10:29:15 -05:00
Adam
fab50b1725
http api: update hiscore for leagues
...
Co-authored-by: Hydrox6 <ikada@protonmail.ch >
2019-11-15 10:29:12 -05:00
Adam
bcf89dce92
Remove DEADMAN_TOURNAMENT world type
...
Co-authored-by: Hydrox6 <ikada@protonmail.ch >
2019-11-15 10:29:09 -05:00