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
This commit is contained in:
TheRealNull
@@ -0,0 +1 @@
|
||||
5464D17DCD348F352EFFE6AA6AEEC5A5609ECBA30EAC2CB2B3D479D2C0DDDA9A
|
||||
@@ -0,0 +1,75 @@
|
||||
.id 3898
|
||||
.int_stack_count 6
|
||||
.string_stack_count 0
|
||||
.int_var_count 11
|
||||
.string_var_count 0
|
||||
get_varbit 4606
|
||||
iconst 0
|
||||
if_icmpne LABEL4
|
||||
jump LABEL5
|
||||
LABEL4:
|
||||
return
|
||||
LABEL5:
|
||||
iconst 512
|
||||
istore 6
|
||||
iconst 512
|
||||
istore 7
|
||||
iload 2
|
||||
iconst 16
|
||||
sub
|
||||
istore 8
|
||||
iconst 0
|
||||
iload 3
|
||||
invoke 1045
|
||||
istore 3
|
||||
iload 2
|
||||
iconst 16
|
||||
sub
|
||||
iload 3
|
||||
invoke 1046
|
||||
istore 3
|
||||
iconst 896
|
||||
sconst "innerZoomLimit"
|
||||
runelite_callback
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
sub
|
||||
istore 9
|
||||
iconst 896
|
||||
sconst "innerZoomLimit"
|
||||
runelite_callback
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
sub
|
||||
istore 10
|
||||
iload 3
|
||||
iload 9
|
||||
multiply
|
||||
iload 8
|
||||
div
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
add
|
||||
istore 6
|
||||
iload 3
|
||||
iload 10
|
||||
multiply
|
||||
iload 8
|
||||
div
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
add
|
||||
istore 7
|
||||
iload 0
|
||||
iload 1
|
||||
iload 7
|
||||
iload 6
|
||||
iload 2
|
||||
iload 4
|
||||
iload 5
|
||||
invoke 3899
|
||||
return
|
||||
@@ -0,0 +1 @@
|
||||
AA98471D04D9CB1172253D0B479EFD2D58394BDD2852F3AE8CD2B2D46FA826C3
|
||||
@@ -0,0 +1,96 @@
|
||||
.id 3899
|
||||
.int_stack_count 7
|
||||
.string_stack_count 0
|
||||
.int_var_count 11
|
||||
.string_var_count 0
|
||||
get_varbit 4606
|
||||
iconst 0
|
||||
if_icmpne LABEL4
|
||||
jump LABEL5
|
||||
LABEL4:
|
||||
return
|
||||
LABEL5:
|
||||
iconst 896
|
||||
sconst "innerZoomLimit"
|
||||
runelite_callback
|
||||
iload 2
|
||||
invoke 1046
|
||||
istore 2
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
iload 2
|
||||
invoke 1045
|
||||
istore 2
|
||||
iconst 896
|
||||
sconst "innerZoomLimit"
|
||||
runelite_callback
|
||||
iload 3
|
||||
invoke 1046
|
||||
istore 3
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
iload 3
|
||||
invoke 1045
|
||||
istore 3
|
||||
iload 2
|
||||
iload 3
|
||||
viewport_setfov
|
||||
iconst 0
|
||||
istore 7
|
||||
iconst 0
|
||||
istore 8
|
||||
viewport_geteffectivesize
|
||||
istore 8
|
||||
istore 7
|
||||
iload 8
|
||||
iconst 334
|
||||
sub
|
||||
istore 9
|
||||
iload 9
|
||||
iconst 0
|
||||
if_icmplt LABEL39
|
||||
jump LABEL42
|
||||
LABEL39:
|
||||
iconst 0
|
||||
istore 9
|
||||
jump LABEL48
|
||||
LABEL42:
|
||||
iload 9
|
||||
iconst 100
|
||||
if_icmpgt LABEL46
|
||||
jump LABEL48
|
||||
LABEL46:
|
||||
iconst 100
|
||||
istore 9
|
||||
LABEL48:
|
||||
iload 2
|
||||
iload 3
|
||||
iload 2
|
||||
sub
|
||||
iload 9
|
||||
multiply
|
||||
iconst 100
|
||||
div
|
||||
add
|
||||
istore 10
|
||||
iconst 25
|
||||
iconst 25
|
||||
iload 10
|
||||
multiply
|
||||
iconst 256
|
||||
div
|
||||
add
|
||||
cam_setfollowheight
|
||||
iload 2
|
||||
iload 3
|
||||
set_varc_int 74
|
||||
set_varc_int 73
|
||||
iload 0
|
||||
iload 1
|
||||
iload 4
|
||||
iload 5
|
||||
iload 6
|
||||
invoke 3900
|
||||
return
|
||||
@@ -0,0 +1 @@
|
||||
03D7F1AF9E8405CB4A74779254E8C65563123F865CC0181186238B038A740755
|
||||
@@ -0,0 +1,78 @@
|
||||
.id 3900
|
||||
.int_stack_count 5
|
||||
.string_stack_count 0
|
||||
.int_var_count 11
|
||||
.string_var_count 0
|
||||
iconst 896
|
||||
sconst "innerZoomLimit"
|
||||
runelite_callback
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
sub
|
||||
istore 5
|
||||
iconst 896
|
||||
sconst "innerZoomLimit"
|
||||
runelite_callback
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
sub
|
||||
istore 6
|
||||
iload 2
|
||||
iconst 16
|
||||
sub
|
||||
istore 7
|
||||
iconst 0
|
||||
istore 8
|
||||
iconst 0
|
||||
istore 9
|
||||
viewport_geteffectivesize
|
||||
istore 9
|
||||
istore 8
|
||||
iconst 0
|
||||
istore 10
|
||||
iload 8
|
||||
iconst 334
|
||||
if_icmpgt LABEL25
|
||||
jump LABEL34
|
||||
LABEL25:
|
||||
get_varc_int 74
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
sub
|
||||
iload 7
|
||||
multiply
|
||||
iload 5
|
||||
div
|
||||
istore 10
|
||||
jump LABEL42
|
||||
LABEL34:
|
||||
get_varc_int 73
|
||||
iconst 128
|
||||
sconst "outerZoomLimit"
|
||||
runelite_callback
|
||||
sub
|
||||
iload 7
|
||||
multiply
|
||||
iload 6
|
||||
div
|
||||
istore 10
|
||||
LABEL42:
|
||||
iload 0
|
||||
iload 1
|
||||
cc_find
|
||||
iconst 1
|
||||
if_icmpeq LABEL48
|
||||
jump LABEL55
|
||||
LABEL48:
|
||||
iload 4
|
||||
iload 10
|
||||
add
|
||||
iload 3
|
||||
iconst 0
|
||||
iconst 0
|
||||
cc_setposition
|
||||
LABEL55:
|
||||
return
|
||||
@@ -0,0 +1 @@
|
||||
A1B6D1B291AA3594728DDEA47049E17119F5CCB6F8E757E1524FA89DE92F9A34
|
||||
Reference in New Issue
Block a user