Commit Graph

171 Commits

Author SHA1 Message Date
Ganom
3388614767 Fix Travis (#714)
* Fix Travis

* Fix Travis

* Fix Travis

* Fix Travis
2019-06-23 21:01:25 +01:00
zeruth
3c02f5b9c8 Use our own http-service / http-api
Also starts scraping xtea keys :)
2019-06-23 05:51:52 -04:00
PKLite
70f6d207ac Adds constructor for data retrieved from http api (just uses a blank username for now)
Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-11 21:02:37 -04:00
PKLite
c5fd9e3a6d Merge branch 'master' into loot-tracker-update 2019-06-11 19:26:02 -04:00
PKLite
e7cffcc29c Merge branch 'master' of https://github.com/runelite-extended/runelite 2019-06-11 19:25:40 -04:00
Tyler Bochard
59ed075ddd Merge pull request #529 from runelite/master
bringup
2019-06-10 02:24:56 -04:00
PKLite
ede14db9b2 Automatically filters loot tracker loot to only show loot that the currently
logged in account has received and to show all loot from all accounts on
login screen

Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-09 00:08:12 -04:00
PKLite
1af704c608 Revert to old project structure
Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-08 01:08:58 -04:00
William Collishaw
462818aad7 Fix typo in 'sessionCheck' function name 2019-06-07 22:26:20 -06:00
zeruth
66cd539190 Various
Adds http-api for our session service
Also fixes HA values, for some reason GE values arent working, will look into.
2019-06-07 01:32:05 -04:00
PKLite
0d0bccada5 Added pvp deaths to loottracking plugin.
Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-06 23:57:10 -04:00
zeruth
882be3cb71 Merges Injector
Welcome to the new world boys.
2019-06-06 20:47:41 -04:00
zeruth
9c536ce939 Finished pre patch day merge 2019-05-23 01:39:15 -04:00
James Munson
7a2bd95f3b switch to our session endpoint 2019-05-20 20:40:04 -07:00
Tomas Slusny
e4cd2bb0b9 Support specifying API endpoins via java props
- Add support fo specifying runelite.session.url java prop to be used
instead of RuneLite session base
- Add support fo specifying runelite.http-service.url java prop to be used
instead of RuneLite api base url
- Add support fo specifying runelite.ws.url java prop to be used
instead of RuneLite websocket url
- Add support for specifying runelite.static.url java prop to be used
instead of RuneLite s.r.n url

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-05-17 00:42:30 +02:00
Tomas Slusny
6071592e57 Change RuneLiteAPI#apiRoot to #sessionBase
- Rename apiRoot method to sessionBase method
- Move /session context path to sessionBase method

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-05-17 00:40:52 +02:00
Lucwousin
6a3afa085b Use runeliteplus.properties for settings instead of runelite.properties (#240) 2019-05-13 10:46:41 +01:00
James
b69578d93d Update (#233)
* xp tracker: display >1m exp with thousandths precision

* fishing plugin: fix trawler timer with one tick left

* Remove gray pixel from Dragon Scimitar cursor (#8725)

* ui: add SplitComponent

SplitComponent is a component containing two other components, with the area split between the two, either horizontally or vertically.


Co-authored-by: Jasper Ketelaar <Jasperketelaar@kpnmail.nl>

* client: add smelting plugin

Co-authored-by: Adam <Adam@sigterm.info>

* constants: add GAME_TICK_LENGTH and use where needed

Also update many usages of 20ms to CLIENT_TICK_LENGTH

* regenmeter: add option to notify before next hp regen

* barrows plugin: add prayer drain timer

* chat: ensure queued messages are always cleared after adding

Mark queued message type as non null because addChatMessage will throw
if it is. This was causing the client to get stuck trying to add the
same broken message each loop.

* xp tracker: show on canvas

Co-authored-by: Jasper Ketelaar <Jasperketelaar@kpnmail.nl>

* party plugin: add partyinfo debug command

* xp tracker: add start and goal levels to on-canvas tracker

* xp tracker (onscreen): add toggle between displaying XP Left/XP Gained

* xp tracker: add right-click configure on on-screen trackers

* party service: check joins are for the current party

The server can resume party membership on handshake to parties other
than the current client party (eg. if the client is restarted or for any
other reason the current party changes). This desyncs otherwise if the
joins aren't checked to be in the current party.

* Add options for actions left and done for on screen XP

Add configurable option for on screen XP display mode, what now
includes:
- Actions done
- Actions left
- Xp gained
- Xp left

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

* Update Merge branch

# Conflicts:
#	README.md
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Calls.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Game.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
#	runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingSession.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ComponentOrientation.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/SplitComponent.java

* client: use immutablemap for maps built in class initializers

* Merge branch 'master' of https://github.com/runelite/runelite into updateee

* Fix
2019-05-12 18:32:18 -06:00
James
33885b86f1 Update BA Plugins, Update from RL master (#226)
* xp tracker: display >1m exp with thousandths precision

* fishing plugin: fix trawler timer with one tick left

* Remove gray pixel from Dragon Scimitar cursor (#8725)

* client: add smelting plugin

Co-authored-by: Adam <Adam@sigterm.info>

* constants: add GAME_TICK_LENGTH and use where needed

Also update many usages of 20ms to CLIENT_TICK_LENGTH

* regenmeter: add option to notify before next hp regen

* barrows plugin: add prayer drain timer

* chat: ensure queued messages are always cleared after adding

Mark queued message type as non null because addChatMessage will throw
if it is. This was causing the client to get stuck trying to add the
same broken message each loop.

* party plugin: add partyinfo debug command

* party service: check joins are for the current party

The server can resume party membership on handshake to parties other
than the current client party (eg. if the client is restarted or for any
other reason the current party changes). This desyncs otherwise if the
joins aren't checked to be in the current party.

* Updated barbassault/ba tools

* Update
2019-05-12 10:16:04 +01:00
Adam
7e6476ce67 party service: check joins are for the current party
The server can resume party membership on handshake to parties other
than the current client party (eg. if the client is restarted or for any
other reason the current party changes). This desyncs otherwise if the
joins aren't checked to be in the current party.
2019-05-11 19:59:51 -04:00
James Munson
f6f1a4b7d0 Update 2019-04-24 17:22:23 -07:00
Jordan Atwood
5bebd34bbf WorldType: Fix HIGH_RISK world type name
This world type is not specifically a PVP world type; at the time of
this commit, world 365 is a non-PVP high-risk world, where the world is
the same as a regular members' world, except that the Protect Item
prayer is disabled.
2019-04-23 13:03:41 -07:00
Adam
ee216e0c43 http api: update for beginner clues
Co-authored-by: Robin Rijkeboer <robin.rijkeboer@itonomy.nl>
2019-04-11 20:54:39 -04:00
Nathaniel Ngo
84009901cb Log whole HTTP response instead of just message (#8126)
Response message is usually either empty or not useful.

Closes #8042
2019-03-19 01:58:46 +01:00
Tomas Slusny
ab4c2e51b8 Remove unnecessary .get() on OkHttp request
GET is default method for OkHttp request builder, no need to explicitely
define it.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-05 08:58:21 +01:00
Tomas Slusny
14fe12e7d6 Convert item stats mapping to use item ids instead of names
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-27 10:10:52 +01:00
Tomas Slusny
0529d5d144 loottracker service: include time in loot record
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-13 23:51:36 +01:00
Adam
b8866c01d8 Merge pull request #7773 from Adam-/ge2
Add GE history tracker
2019-02-12 18:00:44 -05:00
Adam
da67381ba7 Add GE history tracker
Add http service to log completed trades, and submit trades when
completed.
2019-02-12 17:51:59 -05:00
Noah Pittinger
4d35ea0c20 Add EqualsAndHashCode to Lombok data/value that do not extend Object 2019-02-11 23:51:13 -05:00
Adam
860aa89a4d http api: rename OSB ge classes with OSB prefix 2019-02-09 11:41:30 -05: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
Adam
c62941855d Use existing sessionid on login if available 2019-01-31 19:47:56 -05:00
Adam
63c3937f87 Use websocket pings 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
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
Max Weber
f17633daf9 http-api: Include commit hash in User-Agent 2019-01-31 19:47:49 -05:00
Adam
d228add898 http api: fix GameItem to have a no arg constructor
This was broken with the lombok update from 1.16 to 1.18 and breaks
deserializing of loot tracker requests.
2019-01-27 18:33:10 -05:00
Adam
9d5dad5cad Add !pb chat command 2019-01-26 15:58:35 -05:00
Adam
41ae79437e Add task chat command
Co-authored-by: Spedwards <improbablepuzzle@gmail.com>
2019-01-22 19:13:32 -05:00
Adam
0f8a9b934a http api: add runelite user agent to requests 2019-01-11 10:09:48 -05:00
Adam
b65018ae84 Add qp to chat service 2019-01-05 18:03:23 -05:00
Adam
5192a28cec http service: rename kc to chat 2019-01-05 18:03:22 -05:00
Adam
fdf308a694 loot tracker client: add get and delete methods 2018-12-28 18:18:40 -05:00
Adam
021fdbeba7 Merge pull request #7056 from jakespeare/Jakespeare/Fix_Subtract_Typos
Fix Typo in ItemStats: "substracted" to "subtracted"
2018-12-23 18:47:25 -05:00
Jake Schaum
65d8cda020 Fix ItemStats/ItemStatOverlay Typos "substracted" to "subtracted" 2018-12-22 16:24:56 -06:00
Adam
3d9c962c6f Remove old session service and replace usages with new one
The new service was split off into a separate repository
2018-12-22 14:31:18 -05:00
Adam
afa98bb868 loottracker client: close response body 2018-12-20 21:59:56 -05:00
Adam
682bf8d77d http api: add loot tracker service and client
Co-authored-by: TheStonedTurtle <29030969+TheStonedTurtle@users.noreply.github.com>
2018-12-14 18:19:16 -05:00