From 1f7ab3114e56db42a4aa8dc9f889b8bf374b05c9 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 11 Oct 2018 07:43:54 -0400 Subject: [PATCH] Remove zoom plugin It is broken with the last update --- .../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, 6 insertions(+), 905 deletions(-) delete mode 100644 runelite-client/src/main/scripts/OptionsPanelRebuilder.hash delete mode 100644 runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm delete mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash delete mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm delete mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash delete mode 100644 runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm delete mode 100644 runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash delete mode 100644 runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm delete mode 100644 runelite-client/src/main/scripts/ZoomHandler.hash delete 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 76781b3224..a785942b15 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,14 +37,13 @@ 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 deleted file mode 100644 index 95e14db861..0000000000 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index da843aa761..0000000000 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ /dev/null @@ -1,587 +0,0 @@ -.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 deleted file mode 100644 index fcfba2b680..0000000000 --- a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.hash +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 0aabcd80b5..0000000000 --- a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm +++ /dev/null @@ -1,84 +0,0 @@ -.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 deleted file mode 100644 index 9e7c710225..0000000000 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 339db6f98b..0000000000 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm +++ /dev/null @@ -1,83 +0,0 @@ -.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 deleted file mode 100644 index 956b68168c..0000000000 --- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.hash +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 1939145cb0..0000000000 --- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm +++ /dev/null @@ -1,48 +0,0 @@ -.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 deleted file mode 100644 index 408565f318..0000000000 --- a/runelite-client/src/main/scripts/ZoomHandler.hash +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3e0af29bd4..0000000000 --- a/runelite-client/src/main/scripts/ZoomHandler.rs2asm +++ /dev/null @@ -1,91 +0,0 @@ -.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