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