Commit Graph

273 Commits

Author SHA1 Message Date
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
Max Weber
33e76436d3 cache: Add FlatStorage 2019-01-10 03:23:27 -07:00
Joshua Filby
465b20d2ba fix: use correct char for boolean type 2018-12-02 20:40:41 -06:00
Abex
e25f88fad0 Merge pull request #6469 from Joshua-F/feat/structtype
Add StructDefinition to cache
2018-11-27 01:53:02 -07:00
Max Weber
ec5737a1d9 Merge pull request #6470 2018-11-27 01:25:45 -07:00
Joshua Filby
18ec864250 cache: prevent dumping enums with no data 2018-11-27 01:20:35 -07:00
Joshua Filby
f65a0c2268 cache: Add ScriptVarType to Enums 2018-11-27 01:20:35 -07:00
Magic fTail
fb37e494d4 Add id to script output 2018-11-26 07:59:52 +01:00
Joshua Filby
06850cff10 feat: add StructDefinition to cache
Includes a manager for loading and test that each struct into its own file.
2018-11-14 19:55:25 -06:00
Max Weber
608d5fb7a3 cache: Correct Location loading
I guess this changed when they hit the 32k object limit.
2018-10-25 04:10:06 -06:00
Adam
7a99eaf4f7 Merge pull request #5394 from Abextm/if-cache-names
cache: Name InterfaceDefinition
2018-09-12 08:12:38 -04:00
Max Weber
959f83f9a1 cache: add various world map related opcodes 2018-09-11 18:20:58 -06:00
Max Weber
f7c83db941 cache: Store ID in ScriptLoader 2018-09-11 18:20:58 -06:00
Max Weber
36971a2add cache: Disassemble CS1s 2018-09-09 10:47:07 -06:00
Max Weber
9e8c3d8c58 cache: name InterfaceDefinition fields 2018-09-09 10:47:07 -06:00
Abex
3ed69a851e Merge pull request #4792 from Abextm/cache-ordering
cache: Do not depend on Index insertion ordering
2018-08-30 20:16:31 -06:00
Abex
feebe520fb Merge pull request #4793 from Abextm/cache-newlines
cache: Properly produce `\n` only on windows on jdk9+
2018-08-30 20:15:07 -06:00
Adam
c02ff65a5a cache: fix outputstream writeString to not write unicode strings
Add test for assembling a script with a nbsp in it
2018-08-15 08:00:29 -04:00
Max Weber
f6e34b7e16 cache: Properly produce \n only on windows on jdk9+
Setting `line.separator` is considered bad so now it is only read during JVM startup. Preferred behavior is to override println on the PrintWriter.
See http://mail.openjdk.java.net/pipermail/core-libs-dev/2015-January/030567.html
2018-08-08 22:16:53 -06:00
Max Weber
4ab21e1fd3 cache: Do not depend on Index insertion ordering 2018-08-08 22:16:05 -06:00
Adam
7e7fb16693 modelviewer: fix zfighting of models
This uses the stencil buffer to hold face priorities and prevents drawing fragments of a lower priority overtop those of higher on the same model
2018-08-04 16:19:25 -04:00
Su-Shing Chen
65178d053e Fix Assembler tests when autocrlf=true on Windows 2018-07-30 21:47:10 +12:00
Adam
23c13c1d53 cache: fix assembler to set correct switch table index
The int operand of switch instructions is an index into the switch table. The operand was always 0, breaking scripts with multiple switches.
2018-07-24 20:12:34 -04:00