From 78cbf47b8320fbdbbafbeb8e65447e2cb46e2125 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 11 Oct 2018 07:43:54 -0400 Subject: [PATCH 1/2] Revert "Remove zoom plugin" This reverts commit 1f7ab3114e56db42a4aa8dc9f889b8bf374b05c9. --- .../client/plugins/zoom/ZoomPlugin.java | 13 +- .../main/scripts/OptionsPanelRebuilder.hash | 1 + .../main/scripts/OptionsPanelRebuilder.rs2asm | 587 ++++++++++++++++++ .../OptionsPanelZoomMouseListener.hash | 1 + .../OptionsPanelZoomMouseListener.rs2asm | 84 +++ .../main/scripts/OptionsPanelZoomUpdater.hash | 1 + .../scripts/OptionsPanelZoomUpdater.rs2asm | 83 +++ .../main/scripts/ScrollWheelZoomHandler.hash | 1 + .../scripts/ScrollWheelZoomHandler.rs2asm | 48 ++ .../src/main/scripts/ZoomHandler.hash | 1 + .../src/main/scripts/ZoomHandler.rs2asm | 91 +++ 11 files changed, 905 insertions(+), 6 deletions(-) create mode 100644 runelite-client/src/main/scripts/OptionsPanelRebuilder.hash create mode 100644 runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm create mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash create mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm create mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash create mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm create mode 100644 runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash create mode 100644 runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm create mode 100644 runelite-client/src/main/scripts/ZoomHandler.hash create mode 100644 runelite-client/src/main/scripts/ZoomHandler.rs2asm diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java index a785942b15..76781b3224 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java @@ -37,13 +37,14 @@ import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; -//@PluginDescriptor( -// name = "Camera Zoom", -// description = "Expand zoom limit and/or enable vertical camera", -// tags = {"limit", "vertical"}, -// enabledByDefault = false -//) +@PluginDescriptor( + name = "Camera Zoom", + description = "Expand zoom limit and/or enable vertical camera", + tags = {"limit", "vertical"}, + enabledByDefault = false +) public class ZoomPlugin extends Plugin implements KeyListener { private boolean controlDown; diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash new file mode 100644 index 0000000000..95e14db861 --- /dev/null +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash @@ -0,0 +1 @@ +1D663B889321070027599B4B8437A321C0C83336C703BBBA34BE22A183E1D7B9 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm new file mode 100644 index 0000000000..da843aa761 --- /dev/null +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -0,0 +1,587 @@ +.id 909 +.int_stack_count 2 +.string_stack_count 0 +.int_var_count 21 +.string_var_count 0 + load_int 73 + load_int 73 + iload 1 + load_int 10551298 + get_enum_value + istore 2 + load_int 73 + load_int 73 + iload 1 + load_int 10551306 + get_enum_value + istore 3 + load_int 73 + load_int 73 + iload 1 + load_int 10551301 + get_enum_value + istore 4 + load_int 73 + load_int 73 + iload 1 + load_int 10551308 + get_enum_value + istore 5 + load_int 103 + load_int 105 + load_int 1960 + iload 1 + get_enum_value + istore 6 + load_int 103 + load_int 105 + load_int 1961 + iload 1 + get_enum_value + istore 7 + load_int 103 + load_int 105 + load_int 1135 + iload 1 + get_enum_value + istore 8 + load_int 103 + load_int 105 + load_int 1136 + iload 1 + get_enum_value + istore 9 + load_int 0 + istore 10 + load_int 0 + istore 11 + load_int 0 + istore 12 + load_int 0 + istore 13 + load_int 0 + istore 14 + load_int 0 + istore 15 + iload 0 + widget_get_width_widget + istore 16 + iload 0 + widget_get_height_widget + istore 17 + iload 1 + load_int 1745 + if_icmpeq LABEL70 + jump LABEL84 +LABEL70: + load_int 0 + iload 16 + load_int 39387148 + widget_get_width_widget + isub + invoke 1045 + istore 14 + load_int 0 + iload 17 + load_int 39387148 + widget_get_height_widget + isub + invoke 1045 + istore 15 +LABEL84: + get_varbit 4606 + load_int 0 + if_icmpne LABEL88 + jump LABEL253 +LABEL88: + get_varbit 4606 + load_int 2 + if_icmpeq LABEL92 + jump LABEL101 +LABEL92: + load_int 512 + load_int 220 + 6200 + load_int 0 + load_int 0 + load_int 0 + load_int 0 + 6202 + jump LABEL106 +LABEL101: + load_int 512 + load_int 512 + load_int 512 + load_int 512 + 6202 +LABEL106: + load_int 50 + set_camera_focal_point_height + iload 2 + load_int -1 + if_icmpne LABEL112 + jump LABEL252 +LABEL112: + iload 3 + load_int -1 + if_icmpne LABEL116 + jump LABEL252 +LABEL116: + get_viewport_size + istore 11 + istore 10 + load_int 0 + iload 16 + iload 10 + isub + invoke 1045 + load_int 0 + iload 17 + iload 11 + isub + invoke 1045 + istore 13 + istore 12 + iload 10 + iload 11 + load_int 0 + load_int 0 + iload 2 + widget_put_size_widget + iload 10 + load_int 0 + iload 14 + iload 12 + isub + invoke 1045 + isub + iload 11 + load_int 0 + iload 15 + iload 13 + isub + invoke 1045 + isub + load_int 0 + load_int 0 + iload 3 + widget_put_size_widget + iload 4 + load_int -1 + if_icmpne LABEL159 + jump LABEL242 +LABEL159: + iload 5 + load_int -1 + if_icmpne LABEL163 + jump LABEL242 +LABEL163: + iload 12 + iload 14 + isub + load_int 2 + idiv + iload 13 + iload 15 + isub + load_int 2 + idiv + istore 13 + istore 12 + load_int 0 + iload 6 + iload 12 + isub + invoke 1045 + load_int 0 + iload 8 + iload 12 + isub + invoke 1045 + istore 8 + istore 6 + load_int 0 + iload 7 + iload 13 + isub + invoke 1045 + load_int 0 + iload 9 + iload 13 + isub + invoke 1045 + istore 9 + istore 7 + iload 6 + iload 7 + load_int 0 + load_int 0 + iload 4 + widget_put_position_widget + iload 6 + iload 7 + load_int 0 + load_int 0 + iload 5 + widget_put_position_widget + iload 6 + iload 8 + iadd + iload 7 + iload 9 + iadd + load_int 1 + load_int 1 + iload 4 + widget_put_size_widget + iload 6 + iload 8 + iadd + iload 7 + iload 9 + iadd + load_int 1 + load_int 1 + iload 5 + widget_put_size_widget + iload 1 + load_int 73 + load_int 73 + iload 1 + load_int 10551307 + get_enum_value + iload 5 + iload 8 + iload 9 + invoke 910 + jump LABEL252 +LABEL242: + iload 1 + load_int 73 + load_int 73 + iload 1 + load_int 10551307 + get_enum_value + iload 3 + load_int 0 + load_int 0 + invoke 910 +LABEL252: + jump LABEL369 +LABEL253: + load_int 0 + load_int 0 + load_int 0 + load_int 0 + 6202 + get_varc 73 + load_int 128 + load_string "fixedOuterZoomLimit" + runelite_callback + if_icmpge LABEL262 + jump LABEL278 +LABEL262: + get_varc 73 + load_int 896 + load_string "fixedInnerZoomLimit" + runelite_callback + if_icmple LABEL266 + jump LABEL278 +LABEL266: + get_varc 74 + load_int 128 + load_string "resizableOuterZoomLimit" + runelite_callback + if_icmpge LABEL270 + jump LABEL278 +LABEL270: + get_varc 74 + load_int 896 + load_string "resizableInnerZoomLimit" + runelite_callback + if_icmple LABEL274 + jump LABEL278 +LABEL274: + get_varc 73 + get_varc 74 + invoke 42 + jump LABEL281 +LABEL278: + load_int 512 + load_int 512 + invoke 42 +LABEL281: + get_viewport_size + istore 11 + istore 10 + iload 2 + load_int -1 + if_icmpne LABEL288 + jump LABEL369 +LABEL288: + iload 3 + load_int -1 + if_icmpne LABEL292 + jump LABEL369 +LABEL292: + iload 10 + iload 11 + load_int 0 + load_int 0 + iload 2 + widget_put_size_widget + iload 10 + iload 14 + isub + iload 11 + iload 15 + isub + load_int 0 + load_int 0 + iload 3 + widget_put_size_widget + iload 4 + load_int -1 + if_icmpne LABEL312 + jump LABEL359 +LABEL312: + iload 5 + load_int -1 + if_icmpne LABEL316 + jump LABEL359 +LABEL316: + iload 6 + iload 7 + load_int 0 + load_int 0 + iload 4 + widget_put_position_widget + iload 6 + iload 7 + load_int 0 + load_int 0 + iload 5 + widget_put_position_widget + iload 6 + iload 8 + iadd + iload 7 + iload 9 + iadd + load_int 1 + load_int 1 + iload 4 + widget_put_size_widget + iload 6 + iload 8 + iadd + iload 7 + iload 9 + iadd + load_int 1 + load_int 1 + iload 5 + widget_put_size_widget + iload 1 + load_int 73 + load_int 73 + iload 1 + load_int 10551307 + get_enum_value + iload 5 + iload 8 + iload 9 + invoke 910 + jump LABEL369 +LABEL359: + iload 1 + load_int 73 + load_int 73 + iload 1 + load_int 10551307 + get_enum_value + iload 3 + load_int 0 + load_int 0 + invoke 910 +LABEL369: + load_int 73 + load_int 73 + iload 1 + load_int 10551309 + get_enum_value + istore 18 + iload 18 + load_int -1 + if_icmpne LABEL379 + jump LABEL423 +LABEL379: + invoke 1972 + load_int 0 + if_icmpeq LABEL383 + jump LABEL417 +LABEL383: + iload 18 + widget_get_index_widget + load_int 1 + if_icmpeq LABEL388 + jump LABEL417 +LABEL388: + get_varc 173 + load_int -2 + if_icmpeq LABEL392 + jump LABEL399 +LABEL392: + load_int 512 + load_int 0 + load_int 0 + load_int 1 + iload 18 + widget_put_size_widget + jump LABEL416 +LABEL399: + get_varc 173 + load_int -3 + if_icmpeq LABEL403 + jump LABEL410 +LABEL403: + load_int 0 + load_int 0 + load_int 1 + load_int 1 + iload 18 + widget_put_size_widget + jump LABEL416 +LABEL410: + load_int 512 + load_int 334 + load_int 0 + load_int 0 + iload 18 + widget_put_size_widget +LABEL416: + jump LABEL423 +LABEL417: + load_int 512 + load_int 334 + load_int 0 + load_int 0 + iload 18 + widget_put_size_widget +LABEL423: + load_int 73 + load_int 73 + iload 1 + load_int 10551311 + get_enum_value + istore 18 + load_int 0 + istore 19 + load_int 0 + istore 20 + iload 18 + load_int -1 + if_icmpne LABEL437 + jump LABEL481 +LABEL437: + load_int 73 + load_int 73 + iload 1 + load_int 10551303 + get_enum_value + widget_get_index_widget + load_int 1 + if_icmpeq LABEL446 + jump LABEL455 +LABEL446: + get_varbit 4692 + load_int 0 + if_icmpne LABEL450 + jump LABEL453 +LABEL450: + load_int 0 + istore 20 + jump LABEL455 +LABEL453: + load_int 38 + istore 20 +LABEL455: + invoke 1972 + load_int 1 + if_icmpeq LABEL459 + jump LABEL473 +LABEL459: + get_varbit 6254 + load_int 0 + if_icmpeq LABEL463 + jump LABEL468 +LABEL463: + load_int 182 + load_int 4 + iadd + istore 19 + jump LABEL472 +LABEL468: + load_int 120 + load_int 4 + iadd + istore 19 +LABEL472: + jump LABEL475 +LABEL473: + load_int 0 + istore 19 +LABEL475: + iload 19 + iload 20 + load_int 2 + load_int 0 + iload 18 + widget_put_position_widget +LABEL481: + load_int 73 + load_int 73 + iload 1 + load_int 10551303 + get_enum_value + istore 18 + load_int 0 + istore 19 + iload 18 + load_int -1 + if_icmpne LABEL493 + jump LABEL515 +LABEL493: + invoke 1972 + load_int 1 + if_icmpeq LABEL497 + jump LABEL507 +LABEL497: + get_varbit 6254 + load_int 0 + if_icmpeq LABEL501 + jump LABEL504 +LABEL501: + load_int 182 + istore 19 + jump LABEL506 +LABEL504: + load_int 120 + istore 19 +LABEL506: + jump LABEL509 +LABEL507: + load_int 0 + istore 19 +LABEL509: + iload 19 + load_int 0 + load_int 1 + load_int 1 + iload 18 + widget_put_size_widget +LABEL515: + iload 0 + iload 1 + invoke 920 + return diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash new file mode 100644 index 0000000000..fcfba2b680 --- /dev/null +++ b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash @@ -0,0 +1 @@ +654085BE2DFBFB0D64DB0508B593E1640C32945E9ACB7999B04768E6BD497169 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm new file mode 100644 index 0000000000..0aabcd80b5 --- /dev/null +++ b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm @@ -0,0 +1,84 @@ +.id 1048 +.int_stack_count 3 +.string_stack_count 0 +.int_var_count 8 +.string_var_count 0 +; locals +; 2 bar size + get_varbit 4606 + load_int 0 + if_icmpne LABEL4 + jump LABEL5 +LABEL4: + return +LABEL5: + load_int 512 + istore 3 + load_int 512 + istore 4 + iload 1 + widget_get_width_widget + iload 0 + widget_get_width_widget + isub + istore 5 + load_int 0 + iload 2 + invoke 1045 + istore 2 + iload 1 + widget_get_width_widget + iload 0 + widget_get_width_widget + isub + iload 2 + invoke 1046 + istore 2 + load_int 896 + load_string "resizableInnerZoomLimit" + runelite_callback + load_int 128 + load_string "resizableOuterZoomLimit" + runelite_callback + isub + istore 6 ; resizable delta + load_int 896 + load_string "fixedInnerZoomLimit" + runelite_callback + load_int 128 + load_string "fixedOuterZoomLimit" + runelite_callback + isub + istore 7 ; fixed delta + iload 2 + iload 6 + imul + iload 5 + idiv + iload 6 + load_string "zoomLinToExp" + runelite_callback + pop_int + load_int 128 + load_string "resizableOuterZoomLimit" + runelite_callback + iadd + istore 3 + iload 2 + iload 7 + imul + iload 5 + idiv + iload 7 + load_string "zoomLinToExp" + runelite_callback + pop_int + load_int 128 + load_string "fixedOuterZoomLimit" + runelite_callback + iadd + istore 4 + iload 4 + iload 3 + invoke 42 + return diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash new file mode 100644 index 0000000000..9e7c710225 --- /dev/null +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash @@ -0,0 +1 @@ +1E7CB366C4C56524B48B4521B0AFEBEF3A0A68E4D80F06991FA1AAC2983ACAA3 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm new file mode 100644 index 0000000000..339db6f98b --- /dev/null +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm @@ -0,0 +1,83 @@ +.id 1049 +.int_stack_count 0 +.string_stack_count 0 +.int_var_count 6 +.string_var_count 0 +; locals +; 0 resizableZoomRange +; 1 fixedZoomRange +; 2 bar size + load_int 896 + load_string "resizableInnerZoomLimit" + runelite_callback + load_int 128 + load_string "resizableOuterZoomLimit" + runelite_callback + isub + istore 0 + load_int 896 + load_string "fixedInnerZoomLimit" + runelite_callback + load_int 128 + load_string "fixedOuterZoomLimit" + runelite_callback + isub + istore 1 + load_int 17104905 + widget_get_width_widget + load_int 17104911 + widget_get_width_widget + isub + istore 2 + load_int 0 + istore 3 + load_int 0 + istore 4 + get_viewport_size + istore 4 + istore 3 + load_int 0 + istore 5 + iload 3 + load_int 334 + if_icmpgt LABEL27 + jump LABEL36 +LABEL27: + get_varc 74 + load_int 128 + load_string "resizableOuterZoomLimit" + runelite_callback + isub + iload 2 + load_string "zoomExpToLin" + runelite_callback + pop_int + iload 2 + imul + iload 0 + idiv + istore 5 + jump LABEL44 +LABEL36: + get_varc 73 + load_int 128 + load_string "fixedOuterZoomLimit" + runelite_callback + isub + iload 2 + load_string "zoomExpToLin" + runelite_callback + pop_int + iload 2 + imul + iload 1 + idiv + istore 5 +LABEL44: + iload 5 + load_int 0 + load_int 0 + load_int 0 + load_int 17104911 + widget_put_position_widget + return diff --git a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash new file mode 100644 index 0000000000..956b68168c --- /dev/null +++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash @@ -0,0 +1 @@ +8C1A010C661222FD0463C9B2B9F23630B0C51A9836C6D7A7E6ECED0D078637F8 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm new file mode 100644 index 0000000000..1939145cb0 --- /dev/null +++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm @@ -0,0 +1,48 @@ +.id 39 +.int_stack_count 1 +.string_stack_count 0 +.int_var_count 4 +.string_var_count 0 + load_int 0 + load_int 0 + load_string "scrollWheelZoom" + runelite_callback + if_icmpeq LABEL18 + load_int 0 + iload 0 + load_int 25 + imul + isub + istore 1 + load_int 512 + istore 2 + load_int 512 + istore 3 + get_varbit 6357 + load_int 0 + if_icmpeq LABEL14 + jump LABEL33 +LABEL14: + get_varbit 4606 + load_int 0 + if_icmpne LABEL18 + jump LABEL19 +LABEL18: + return +LABEL19: + 6205 + istore 2 + istore 3 + iload 3 + iload 1 + iadd + istore 3 + iload 2 + iload 1 + iadd + istore 2 + iload 3 + iload 2 + invoke 42 +LABEL33: + return diff --git a/runelite-client/src/main/scripts/ZoomHandler.hash b/runelite-client/src/main/scripts/ZoomHandler.hash new file mode 100644 index 0000000000..408565f318 --- /dev/null +++ b/runelite-client/src/main/scripts/ZoomHandler.hash @@ -0,0 +1 @@ +C59E7F42A1DBD7E7D130D9BFC470F3148D04ECE705CEF1E15BC2A84B63042989 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ZoomHandler.rs2asm b/runelite-client/src/main/scripts/ZoomHandler.rs2asm new file mode 100644 index 0000000000..3e0af29bd4 --- /dev/null +++ b/runelite-client/src/main/scripts/ZoomHandler.rs2asm @@ -0,0 +1,91 @@ +.id 42 +.int_stack_count 2 +.string_stack_count 0 +.int_var_count 6 +.string_var_count 0 + get_varbit 4606 + load_int 0 + if_icmpne LABEL4 + jump LABEL5 +LABEL4: + return +LABEL5: + load_int 896 + load_string "fixedInnerZoomLimit" + runelite_callback + iload 0 + invoke 1046 + istore 0 + load_int 128 + load_string "fixedOuterZoomLimit" + runelite_callback + iload 0 + invoke 1045 + istore 0 + load_int 896 + load_string "resizableInnerZoomLimit" + runelite_callback + iload 1 + invoke 1046 + istore 1 + load_int 128 + load_string "resizableOuterZoomLimit" + runelite_callback + iload 1 + invoke 1045 + istore 1 + iload 0 + iload 1 + 6200 + load_int 0 + istore 2 + load_int 0 + istore 3 + get_viewport_size + istore 3 + istore 2 + iload 3 + load_int 334 + isub + istore 4 + iload 4 + load_int 0 + if_icmplt LABEL39 + jump LABEL42 +LABEL39: + load_int 0 + istore 4 + jump LABEL48 +LABEL42: + iload 4 + load_int 100 + if_icmpgt LABEL46 + jump LABEL48 +LABEL46: + load_int 100 + istore 4 +LABEL48: + iload 0 + iload 1 + iload 0 + isub + iload 4 + imul + load_int 100 + idiv + iadd + istore 5 + load_int 25 + load_int 25 + iload 5 + imul + load_int 256 + idiv + iadd + set_camera_focal_point_height + iload 0 + iload 1 + put_varc 74 + put_varc 73 + invoke 1049 + return From dea5efffc2ec19045bb492fe1a82bd74ba77e5e5 Mon Sep 17 00:00:00 2001 From: Magic fTail Date: Thu, 11 Oct 2018 19:21:43 +0200 Subject: [PATCH 2/2] Fix zoom after update --- .../client/plugins/zoom/ZoomConfig.java | 17 ++-------- .../client/plugins/zoom/ZoomPlugin.java | 28 +++------------- .../main/scripts/OptionsPanelRebuilder.rs2asm | 8 ++--- .../OptionsPanelZoomMouseListener.rs2asm | 20 ++++-------- .../scripts/OptionsPanelZoomUpdater.rs2asm | 32 +++++++------------ .../scripts/ScrollWheelZoomHandler.rs2asm | 2 +- .../src/main/scripts/ZoomHandler.rs2asm | 8 ++--- 7 files changed, 31 insertions(+), 84 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java index bd26a31f7f..a76fc33955 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java @@ -31,22 +31,11 @@ import net.runelite.client.config.ConfigItem; @ConfigGroup("zoom") public interface ZoomConfig extends Config { - @ConfigItem( - keyName = "enabled", - name = "Expand outer zoom limit", - description = "Configures whether or not the outer zoom limit is reduced", - position = 1 - ) - default boolean outerLimit() - { - return true; - } - @ConfigItem( keyName = "inner", name = "Expand inner zoom limit", description = "Configures whether or not the inner zoom limit is reduced", - position = 2 + position = 1 ) default boolean innerLimit() { @@ -57,7 +46,7 @@ public interface ZoomConfig extends Config keyName = "relaxCameraPitch", name = "Vertical camera", description = "Relax the camera's upper pitch limit", - position = 3 + position = 2 ) default boolean relaxCameraPitch() { @@ -68,7 +57,7 @@ public interface ZoomConfig extends Config keyName = "requireControlDown", name = "Require control down", description = "Configures if holding control is required for zooming", - position = 4 + position = 3 ) default boolean requireControlDown() { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java index 76781b3224..0a0cec9a48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java @@ -82,34 +82,16 @@ public class ZoomPlugin extends Plugin implements KeyListener intStack[intStackSize - 1] = 1; } - if (zoomConfig.outerLimit()) + if ("innerZoomLimit".equals(event.getEventName()) && zoomConfig.innerLimit()) { - switch (event.getEventName()) - { - case "fixedOuterZoomLimit": - intStack[intStackSize - 1] = 95; - break; - case "resizableOuterZoomLimit": - intStack[intStackSize - 1] = 70; - break; - } + intStack[intStackSize - 1] = 1200; + return; } + if (zoomConfig.innerLimit()) - { - switch (event.getEventName()) - { - case "fixedInnerZoomLimit": - intStack[intStackSize - 1] = 2100; - break; - case "resizableInnerZoomLimit": - intStack[intStackSize - 1] = 2200; - break; - } - } - if (zoomConfig.outerLimit() || zoomConfig.innerLimit()) { // This lets the options panel's slider have an exponential rate - final double exponent = 3.d; + final double exponent = 2.d; switch (event.getEventName()) { case "zoomLinToExp": diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm index da843aa761..a7d3773284 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -276,28 +276,24 @@ LABEL253: 6202 get_varc 73 load_int 128 - load_string "fixedOuterZoomLimit" - runelite_callback if_icmpge LABEL262 jump LABEL278 LABEL262: get_varc 73 load_int 896 - load_string "fixedInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback if_icmple LABEL266 jump LABEL278 LABEL266: get_varc 74 load_int 128 - load_string "resizableOuterZoomLimit" - runelite_callback if_icmpge LABEL270 jump LABEL278 LABEL270: get_varc 74 load_int 896 - load_string "resizableInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback if_icmple LABEL274 jump LABEL278 diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm index 0aabcd80b5..cb1d9c868e 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm @@ -35,19 +35,15 @@ LABEL5: invoke 1046 istore 2 load_int 896 - load_string "resizableInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback load_int 128 - load_string "resizableOuterZoomLimit" - runelite_callback isub istore 6 ; resizable delta load_int 896 - load_string "fixedInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback load_int 128 - load_string "fixedOuterZoomLimit" - runelite_callback isub istore 7 ; fixed delta iload 2 @@ -57,11 +53,9 @@ LABEL5: idiv iload 6 load_string "zoomLinToExp" - runelite_callback - pop_int + runelite_callback + pop_int load_int 128 - load_string "resizableOuterZoomLimit" - runelite_callback iadd istore 3 iload 2 @@ -71,11 +65,9 @@ LABEL5: idiv iload 7 load_string "zoomLinToExp" - runelite_callback - pop_int + runelite_callback + pop_int load_int 128 - load_string "fixedOuterZoomLimit" - runelite_callback iadd istore 4 iload 4 diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm index 339db6f98b..c0a6c409e7 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm @@ -8,19 +8,15 @@ ; 1 fixedZoomRange ; 2 bar size load_int 896 - load_string "resizableInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback load_int 128 - load_string "resizableOuterZoomLimit" - runelite_callback isub istore 0 load_int 896 - load_string "fixedInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback load_int 128 - load_string "fixedOuterZoomLimit" - runelite_callback isub istore 1 load_int 17104905 @@ -45,33 +41,29 @@ LABEL27: get_varc 74 load_int 128 - load_string "resizableOuterZoomLimit" - runelite_callback - isub - iload 2 + isub + iload 0 load_string "zoomExpToLin" - runelite_callback - pop_int + runelite_callback + pop_int iload 2 imul iload 0 - idiv + idiv istore 5 jump LABEL44 LABEL36: get_varc 73 load_int 128 - load_string "fixedOuterZoomLimit" - runelite_callback - isub - iload 2 + isub + iload 0 load_string "zoomExpToLin" - runelite_callback - pop_int + runelite_callback + pop_int iload 2 imul iload 1 - idiv + idiv istore 5 LABEL44: iload 5 diff --git a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm index 1939145cb0..9ca40fbbf2 100644 --- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm +++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm @@ -3,7 +3,7 @@ .string_stack_count 0 .int_var_count 4 .string_var_count 0 - load_int 0 + load_int 1 load_int 0 load_string "scrollWheelZoom" runelite_callback diff --git a/runelite-client/src/main/scripts/ZoomHandler.rs2asm b/runelite-client/src/main/scripts/ZoomHandler.rs2asm index 3e0af29bd4..21fd9b5614 100644 --- a/runelite-client/src/main/scripts/ZoomHandler.rs2asm +++ b/runelite-client/src/main/scripts/ZoomHandler.rs2asm @@ -11,26 +11,22 @@ LABEL4: return LABEL5: load_int 896 - load_string "fixedInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback iload 0 invoke 1046 istore 0 load_int 128 - load_string "fixedOuterZoomLimit" - runelite_callback iload 0 invoke 1045 istore 0 load_int 896 - load_string "resizableInnerZoomLimit" + load_string "innerZoomLimit" runelite_callback iload 1 invoke 1046 istore 1 load_int 128 - load_string "resizableOuterZoomLimit" - runelite_callback iload 1 invoke 1045 istore 1