From 48966a9ab54e2426f2459fa5c47a071cd70dda3d Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 5 Mar 2018 19:47:02 -0500 Subject: [PATCH] Change mouse wheel listener back to an interface as the instance map input listener uses it Update instance map for new mouse wheel listener api --- .../java/net/runelite/client/input/MouseWheelListener.java | 7 ++----- .../plugins/instancemap/InstanceMapInputListener.java | 5 +++-- .../plugins/stretchedfixedmode/TranslateMouseListener.java | 1 - .../stretchedfixedmode/TranslateMouseWheelListener.java | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/input/MouseWheelListener.java b/runelite-client/src/main/java/net/runelite/client/input/MouseWheelListener.java index 060b3814de..a2a6840e82 100644 --- a/runelite-client/src/main/java/net/runelite/client/input/MouseWheelListener.java +++ b/runelite-client/src/main/java/net/runelite/client/input/MouseWheelListener.java @@ -26,10 +26,7 @@ package net.runelite.client.input; import java.awt.event.MouseWheelEvent; -public abstract class MouseWheelListener +public interface MouseWheelListener { - public MouseWheelEvent mouseWheelMoved(MouseWheelEvent event) - { - return event; - } + MouseWheelEvent mouseWheelMoved(MouseWheelEvent event); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java index 2f0ed0727a..5fa74240f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java @@ -66,11 +66,11 @@ public class InstanceMapInputListener extends MouseListener implements KeyListen } @Override - public void mouseWheelMoved(MouseWheelEvent event) + public MouseWheelEvent mouseWheelMoved(MouseWheelEvent event) { if (!plugin.isMapShown()) { - return; + return event; } int direction = event.getWheelRotation(); @@ -85,6 +85,7 @@ public class InstanceMapInputListener extends MouseListener implements KeyListen } event.consume(); + return event; } @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java index 3df2fbd4b9..20fc63abb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java @@ -29,7 +29,6 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.event.MouseEvent; import javax.inject.Inject; -import javax.inject.Provider; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.client.input.MouseListener; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseWheelListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseWheelListener.java index 8c9d556952..25c575864f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseWheelListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseWheelListener.java @@ -29,12 +29,11 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.event.MouseWheelEvent; import javax.inject.Inject; -import javax.inject.Provider; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.client.input.MouseWheelListener; -public class TranslateMouseWheelListener extends MouseWheelListener +public class TranslateMouseWheelListener implements MouseWheelListener { private final Client client;