Commit Graph
345 Commits
Author SHA1 Message Date
leejt d84caf7db2 Update WorldMapDefinition attributes
Changed the WorldMapType field names from fieldxxx to values
that represent what they actually mean (mostly x, y, z coordinates)
2020-01-13 17:02:23 -08: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 c549114734 cache: add param config 2020-01-03 09:26:08 -05: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
Owain van Brakel 18021f6bed gradle: Refactor and update to gradle 6 2019-11-10 01:42:11 +01:00
Owain van Brakel 2655654c9f project: merge upstream 2019-10-30 04:22:38 +01:00
Adam c2e7b61a68 cache: update npc definition and loader 2019-10-26 12:45:49 -04:00
Owain van Brakel 47d56f9d0a Merge remote-tracking branch 'runelite/master' into 1310-merge 2019-10-13 16:02:41 +02:00
Adam 562ff3232e cache: update object definition 2019-10-11 08:55:54 -04:00
Lucwousin fd294114e2 rev184 2019-09-26 14:41:30 +02:00
Owain van Brakel 1c45af2404 wiki-scraper/cache: Fix NPE 2019-08-15 23:47:59 +02:00
Owain van Brakel bd621269a6 gradle: Update deps, format files (#1316)
* gradle: Update dependencies

Also made the version numbers global to make updating easier, also this
way we can't have mismatches where different projects use diffrent
versions of a dep

* cache: Fix TitleDumper test

* gradle: Format build files

* httpserviceplus: Remove unneeded deps
2019-08-13 21:02:45 -04:00
Owain van Brakel 0a4daac223 gradle: processTestResources 2019-07-27 08:04:19 +02:00
Owain van Brakel 17b35205fd project: Fix deprecations and supress unchecked warnings 2019-07-25 20:34:09 +02:00
Zeruth c2739cba77 runeliteplus: checkstyle fixes, add support for gradle in travis 2019-07-23 23:54:35 -04:00
Zeruth 95b9952ccd cache: actually fix script assembly encoding 2019-07-23 22:02:57 -04:00
Zeruth e4f9aa1d6a runeliteplus: adds preliminary Gradle support 2019-07-23 02:07:02 -04:00
Jonathan Beaudoin 35ab316d76 Cast ByteBuffer to Buffer to avoid compilation error with jdk 1.8u211 2019-07-14 15:31:31 -04:00
Tyler Bochard a13c80d74b Merge pull request #960 from Lucwousin/reeeee-facts-boi
RSClient: More refactoring
2019-07-11 00:51:28 -04:00
Ian William O'Neill eaeedbaadb Slayer Points command and some Renaming. (#966)
* Renaming and Tests for Sound Effects in cache.

* SlayerPlugin: added !points command.
2019-07-11 00:43:51 -04:00
Lucwousin 5244775148 Add more script opcodes 2019-07-10 10:58:35 +02:00
Lucas 83533475d4 Even more... you guessed it! REFACTORING. Removes the need for @Export for methods overriding base java methods 2019-07-07 21:43:57 +02:00
Zeruth f4b024804e Merge remote-tracking branch 'upstream/master' into runelite-master-1
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
2019-07-05 00:59:14 -04:00
Max Weber 911893b710 cache/FrameDumperTest: Don't get the wrong framemaps for a frame 2019-07-03 08:45:24 -06:00
Zeruth e111b3aeae Revert "bringup to current runelite-master"
This reverts commit 74da8a883f.
2019-07-02 18:39:36 -04:00
Zeruth 74da8a883f bringup to current runelite-master 2019-07-01 18:10:13 -04:00
William Collishaw 83d2a7e58b Clean up some instances of double white space 2019-06-30 10:19:49 -06:00
sdburns1998 8d77971c83 Merge remote-tracking branch 'runelite/master' into ihategitandihatethisihatemergingupstream 2019-06-29 01:08:56 +02:00
Kyleeld c2f405cf8f Revert "Upstreamyboy" 2019-06-28 23:58:38 +01:00
William Collishaw 8f302a1532 Replace use of deprecated Guava Files write method 2019-06-29 00:25:46 +02:00
William Collishaw 5025b6d5af Replace use of deprecated Guava Files write method 2019-06-27 01:51:27 -06:00
Tyler Bochard 59ed075ddd Merge pull request #529 from runelite/master
bringup
2019-06-10 02:24:56 -04:00
Lucas 9a4d37d7bb Merge remote-tracking branch 'ext_upstream/master' into master3
# Conflicts:
#	deobfuscator/pom.xml
#	deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java
#	deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java
#	deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java
#	deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java
#	deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java
#	deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java
#	deobfuscator/src/main/java/net/runelite/asm/pool/Class.java
#	deobfuscator/src/main/java/net/runelite/asm/pool/Field.java
#	deobfuscator/src/main/java/net/runelite/deob/Deob.java
#	deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java
#	deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java
#	deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java
#	deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java
#	deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java
#	deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java
#	deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java
#	deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java
#	deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java
#	deobfuscator/src/test/java/net/runelite/asm/annotations/MyAnnotation.java
#	deobfuscator/src/test/java/net/runelite/asm/execution/mapper/StaticStepTest.java
#	deobfuscator/src/test/java/net/runelite/asm/execution/tests/TableSwitch.java
#	deobfuscator/src/test/java/net/runelite/asm/signature/SignatureTest.java
#	deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java
#	deobfuscator/src/test/java/net/runelite/deob/TemporyFolderLocation.java
#	deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java
#	deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBufferTest.java
#	deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/ClassA.java
#	deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java
#	deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java
#	deobfuscator/src/test/java/net/runelite/osb/inject/FieldHook.java
#	injected-client/pom.xml
#	injector-plugin/pom.xml
#	injector-plugin/src/main/java/net/runelite/injector/Inject.java
#	injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java
#	injector-plugin/src/main/java/net/runelite/injector/InjectionException.java
#	injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java
#	injector-plugin/src/main/java/net/runelite/injector/raw/ClearColorBuffer.java
#	injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java
#	injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java
#	pom.xml
#	runelite-api/src/main/java/net/runelite/api/Actor.java
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/CollisionData.java
#	runelite-api/src/main/java/net/runelite/api/EquipmentInventorySlot.java
#	runelite-api/src/main/java/net/runelite/api/NPCDefinition.java
#	runelite-api/src/main/java/net/runelite/api/Perspective.java
#	runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
#	runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
#	runelite-api/src/main/java/net/runelite/api/events/GraphicChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java
#	runelite-api/src/main/java/net/runelite/api/events/SpotAnimationChanged.java
#	runelite-api/src/main/java/net/runelite/api/vars/AccountType.java
#	runelite-api/src/main/java/net/runelite/mapping/Construct.java
#	runelite-api/src/main/java/net/runelite/mapping/Hook.java
#	runelite-api/src/main/java/net/runelite/mapping/Implements.java
#	runelite-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
#	runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
#	runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java
#	runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
#	runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
#	runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java
#	runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java
#	runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
#	runescape-api/src/main/java/net/runelite/mapping/Implements.java
#	runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSItem.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSModel.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java
#	runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
2019-06-08 23:06:59 +02:00
Tomas Slusny 1eb68559e4 Merge pull request #9057 from WilliamCollishaw/fix-getProperties-typo
Fix typo in 'getProperties' function name
2019-06-08 22:52:51 +02:00
zeruth e4d6e9fe13 Port Injector to main layout
Adds deobfuscator
Adds injected-client
Adds injector-plugin
Adds runescape-client

Replaces RL's apis

Small bug with sprites atm, will be resolved soon. tired af.

Builds, probably
2019-06-08 05:43:03 -04:00
William Collishaw 1733147195 Fix typo in 'getProperties' function name 2019-06-07 22:26:50 -06:00
William Collishaw e88e2cdf85 Fix typo in 'dumpJson' function name 2019-06-07 22:24:15 -06:00
zeruth eafb024f16 Revert to old layout for refactor 2019-06-07 23:54:32 -04:00
zeruth 882be3cb71 Merges Injector
Welcome to the new world boys.
2019-06-06 20:47:41 -04:00
William Collishaw 531546e3a0 Remove redundant subString endindex .length() calls 2019-06-01 13:19:15 -06:00
Adam ed8a24b069 cache: datafile: simplify next sector calculation 2019-04-06 13:43:11 -04:00
RuneLite Cache-Code Autoupdater fc48e2a936 Rewrite scripts with new opcodes 2019-03-09 00:01:48 -07:00
Max Weber 75fbb07b41 cache: use RuneStar cs2 opcode names
With exception of the opcodes with jvm analogues, which follow jvm style
2019-03-09 00:01:48 -07:00
Adam 40ea7fa607 cache: assign temporary names for new varc string opcodes 2019-03-07 08:38:55 -05:00
Max Weber 527be68a81 cache: Include id in StructDefinition 2019-01-28 03:29:34 -07:00
Max Weber 3253de9466 cache: use lombok Data for all definitions 2019-01-28 03:22:44 -07:00
Abex bc627809e1 Merge pull request #7214 from Abextm/flatcache
cache: Add FlatStorage
2019-01-17 15:54:27 -07:00
Max Weber 43bcbe0e1d cache: Generate NullItemID 2019-01-15 22:29:10 -07:00
Max Weber 330d47b5ec cache: Add equals and hashCode to all Definitions
Lombok is updated due to lombok issue 1724 breaking ModelDefinition
2019-01-10 03:23:27 -07:00