Commit Graph

10154 Commits

Author SHA1 Message Date
Lucwousin
8bdb204019 gradle: injected-client things
Move injector goal to injected-client(ish)
Keep injected-client classes in the correct package
Remove placeholder class/duplicate vanilla jar
2019-07-28 14:00:18 +02:00
ST0NEWALL
81e99a2d9b loottracker: fix tob not being recorded
* Hopefully fixes tob loot not showing. haven't been able to test it because me no good pvm

Signed-off-by: PKLite <stonewall@pklite.xyz>

* take out old import

Signed-off-by: PKLite <stonewall@pklite.xyz>

* implement Blue's change

* Update LootTrackerPlugin.java

* add missing import

Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-07-28 10:31:51 +01:00
Ganom
0023196ca1 aoewarnings: Update, refactor, and clean up. (#1164)
* aoewarnings: Update, refactor, and clean up.

* Various Code Style Fixes
2019-07-28 09:36:56 +01:00
Ganom
22e15fc3d2 resources: Wiki scrape latest ItemStats/NpcStats (#1165) 2019-07-28 09:02:53 +01:00
Ganom
81ad12686b Merge pull request #1162 from runelite-extended/fix-scouter
discordclient: Remove builder.default on embed array.
2019-07-27 20:43:51 -04:00
Ganom
c4402febf7 Remove builder.default on embed array. 2019-07-27 20:27:19 -04:00
ST0NEWALL
4df5bdcd0a wildernesslocations: Add support for PvP world locations, add location names to world map (#1126)
* Locations will now work in Pvp worlds. Started mapping some of the main ones, still need to map some more

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Add the locations provided by the beast Kyle!!

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Add more locations

Signed-off-by: PKLite <stonewall@pklite.xyz>

* remove stupid extra comma

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Refactor WildernessLocation to WorldLocation and move it to the game package
also removed duplicate entry

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Adds an overlay that draws wilderness location names on the World Map

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Removes area outline because the areas need to be fixed

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Fixes outlines

Signed-off-by: PKLite <stonewall@pklite.xyz>

* merge conflicts

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Sort world locs a-z, and fix whitespace
2019-07-27 20:08:55 -04:00
Owain van Brakel
75ef43cc0e client: Add back item tests (#1160)
* Fix upstream merge

* mixins: Fix checkstyle

* client: Add back item tests

* discord: builder default
2019-07-27 23:45:27 +01:00
Ganom
6ab7640266 Add Missing hally animation (#1159) 2019-07-27 23:06:11 +01:00
Lucwousin
22f6146ea7 project: Fix upstream merge (#1157)
* Fix upstream merge

* Update RSItemContainerMixin.java
2019-07-27 23:05:55 +01:00
Ganom
9ed6f586dd Update and refactor PlayerScouter (#1158) 2019-07-27 17:58:30 -04:00
Tyler Bochard
95174f1520 Merge pull request #1156 from Ganom/gauntlet-update
gauntlet: add player attack counter.
2019-07-27 17:48:16 -04:00
ThatGamerBlue
2ba1c7f80b gradle: add properties and modify injected-client (#1145)
* add implementation for getItemCount

* Ignore build directory in project root

* save injector results as class files

* package injected-client for shading into client

* auto-updating properties

* fix run task

* shade injected-client into jar
2019-07-27 15:02:57 -04:00
Ganom
4f228da3f3 Update Gauntlet to include player attack counter. 2019-07-27 14:48:30 -04:00
ST0NEWALL
207c65c325 gradle: Remove deprecated methods & fix tests (#1149)
gradle: Remove deprecated methods & fix tests
2019-07-27 02:18:13 -04:00
Owain van Brakel
3fd16bbea1 gradle: update mockito
Mockito-all is discontinued
2019-07-27 08:04:55 +02:00
Owain van Brakel
ff50dc5272 gradle: Skip specific tests 2019-07-27 08:04:27 +02:00
Owain van Brakel
0a4daac223 gradle: processTestResources 2019-07-27 08:04:19 +02:00
Owain van Brakel
8d1489254f gradle: Remove deprecated methods 2019-07-27 07:20:48 +02:00
Chris Johnson
d8ddfa9110 Fix labels for agility threshold configs (#1146) 2019-07-26 22:45:09 -04:00
Crystalknoct
83cd44e336 menuentryswapperplugin: Added Sarachnis crypt swap (#1122)
* menuentryswapperplugin: Added Sarachnis crypt swap

Added quick swap to sarachnis crypt.

* remove duplicate swapQuick option.equals("enter")

remove duplicate this.swapQuick && option.equals("enter")

* Menuentryswapperplugin: cleaned up Sarachnis Swap

Deleted duplicate entry
2019-07-26 21:47:18 +01:00
Chris Johnson
39fd5f6bac Show agility level overhead (either as icons or text) (#1100)
As well as some general player indicator improvements around multiple conflicting options
2019-07-26 20:01:38 +01:00
OnlyHereToPlayOsrs
fa0bf2b0d2 gauntlet boss helper : add corrupted projectiles (#1143) 2019-07-26 19:59:53 +01:00
Kyleeld
36f52232c8 MenuEntrySwapper: Crystal Impling Jar (#1138)
MenuEntrySwapper: Crystal Impling Jar
2019-07-26 19:59:09 +01:00
OnlyHereToPlayOsrs
604e034a9a gauntlet: add boss helper (#1141)
* Gauntlet Boss Helper

* xd
2019-07-26 10:04:43 -04:00
Ganom
ffb7ce6160 Merge pull request #1137 from Rune-King/MiningOverlayFix
mining: Fix plugin not showing
2019-07-25 23:21:18 -04:00
Rune-King
c89e9541ff Fix mining plugin not showing
GameTick event was missing from subscriptions
2019-07-26 13:14:40 +10:00
Tyler Bochard
8233e82374 Merge pull request #1136 from runelite-extended/discord-presence
discord: enforce runeliteplus presence
2019-07-25 22:22:00 -04:00
Zeruth
6eed74dfb1 runeliteplus: fix plugin 2019-07-25 22:17:06 -04:00
Zeruth
f48b6b4f4f discord: enforce runeliteplus presence 2019-07-25 22:06:56 -04:00
Ganom
2888827772 Merge pull request #1134 from runelite-extended/api-item
api: proper interface
2019-07-25 21:49:59 -04:00
Zeruth
f3a9fbc9fb api: proper interface 2019-07-25 21:17:35 -04:00
Tyler Bochard
71de1ac8ea Merge pull request #1133 from Owain94/slayer-v2
slayer: fix slayer tracker -- justin
2019-07-25 19:01:29 -04:00
Owain van Brakel
3c5c5f1996 Merge remote-tracking branch 'upstream/master' into slayer-v2 2019-07-26 00:59:39 +02:00
Tyler Bochard
dbb00b482c Merge pull request #1132 from runelite-extended/presence
properties: fix presence config
2019-07-25 18:56:27 -04:00
Justin
4b71f300c0 slayerplugin: fixed Slayer Tracker not tracking
fixed tests, made slayer tracker actually track kills
2019-07-26 00:56:03 +02:00
Owain van Brakel
bbe287e2aa slayer: weakness overlay 2019-07-26 00:53:19 +02:00
Zeruth
80ed5c4327 properties: fix presence config 2019-07-25 18:50:18 -04:00
Tyler Bochard
bc08b98838 Merge pull request #1131 from Ganom/refactor_container
runeliteapi: Refactor PLAYER_INTERFACE_CONTAINER_OPENED and add documentation.
2019-07-25 18:18:27 -04:00
Ganom
c7d6c6ce42 Refactor PLAYER_INTERFACE_CONTAINER_OPENED and add documentation. 2019-07-25 18:14:31 -04:00
Tyler Bochard
ebc8294590 Merge pull request #1121 from Owain94/checkstyle-gradle
gradle: checkstyle changes
2019-07-25 16:44:20 -04:00
Tyler Bochard
40d4428e8c Merge pull request #1130 from Owain94/slayer-weakness
slayer: Fix weakness
2019-07-25 16:43:31 -04:00
Tyler Bochard
7ec0e6e4db Merge pull request #1129 from runelite-extended/runelite-update
runeliteplus: Merge upstream
2019-07-25 16:43:07 -04:00
Owain van Brakel
11e9528cf3 slayer: Fix weakness 2019-07-25 20:47:28 +02:00
Zeruth
6f4cda63ac hooks: fix small typo 2019-07-25 14:47:14 -04:00
Owain van Brakel
17b35205fd project: Fix deprecations and supress unchecked warnings 2019-07-25 20:34:09 +02:00
Zeruth
5de903304e runeliteplus: merge upstream 2019-07-25 14:30:56 -04:00
Zeruth
51e1ae5aaf Merge remote-tracking branch 'Upstream/master'
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/TileItem.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
2019-07-25 14:14:20 -04:00
Tomas Slusny
d7d9bef1e0 Merge pull request #9415 from Nightfirecat/fix-teleblock-timer-patterns
timersplugin: Escape periods in teleblock patterns
2019-07-25 18:18:34 +02:00
David
c0cc1a9fc4 Add GE limit for Drift net (#9411) 2019-07-25 15:32:05 +02:00