From 0307a692a63403840c2ea4bde581a9d44ef2a4a4 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Fri, 2 Aug 2019 17:40:17 -0400 Subject: [PATCH 1/3] flexo: robotpeer -> robot --- .../main/java/net/runelite/client/flexo/Flexo.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java index 0f7a02d3dc..27fa1571be 100644 --- a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java +++ b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java @@ -65,7 +65,7 @@ public class Flexo extends Robot public static int minDelay = 45; public static MouseMotionFactory currentMouseMotionFactory; public boolean pausedIndefinitely = false; - private RobotPeer peer; + private Robot peer; public Flexo() throws AWTException { @@ -82,10 +82,10 @@ public class Flexo extends Robot Toolkit toolkit = Toolkit.getDefaultToolkit(); if (toolkit instanceof ComponentFactory) { - peer = ((ComponentFactory) toolkit).createRobot(this, screen); - RobotDisposer disposer = new RobotDisposer(peer); - sun.java2d.Disposer.addRecord(anchor, disposer); + peer = new Robot(); + return; } + client.getLogger().error("Flexo not supported on this system configuration."); } private transient Object anchor = new Object(); @@ -313,10 +313,9 @@ public class Flexo extends Robot } - @Override public Color getPixelColor(int x, int y) { - return new Color(peer.getRGBPixel(x, y)); + return peer.getPixelColor(x, y); } @Override From 7ebcf31e58e0a85f3b8ce917175178d45ae9b969 Mon Sep 17 00:00:00 2001 From: Zeruth Date: Fri, 2 Aug 2019 18:01:41 -0400 Subject: [PATCH 2/3] flexo: remove unused stuff --- .../java/net/runelite/client/flexo/Flexo.java | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java index 27fa1571be..45e9d29b50 100644 --- a/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java +++ b/runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java @@ -41,16 +41,13 @@ import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; import java.awt.Point; import java.awt.Robot; -import java.awt.Toolkit; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import java.awt.peer.RobotPeer; import java.util.Random; import java.util.logging.Logger; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.client.ui.ClientUI; -import sun.awt.ComponentFactory; public class Flexo extends Robot { @@ -79,35 +76,18 @@ public class Flexo extends Robot private void init(GraphicsDevice screen) throws AWTException { - Toolkit toolkit = Toolkit.getDefaultToolkit(); - if (toolkit instanceof ComponentFactory) + try { peer = new Robot(); - return; } - client.getLogger().error("Flexo not supported on this system configuration."); + catch (Exception e) + { + client.getLogger().error("Flexo not supported on this system configuration."); + } } private transient Object anchor = new Object(); - static class RobotDisposer implements sun.java2d.DisposerRecord - { - private final RobotPeer peer; - - private RobotDisposer(RobotPeer peer) - { - this.peer = peer; - } - - public void dispose() - { - if (peer != null) - { - peer.dispose(); - } - } - } - private void pauseMS(int delayMS) { long initialMS = System.currentTimeMillis(); From 656a36b04ac9226ebeb52a86a62eed7dbeb728ca Mon Sep 17 00:00:00 2001 From: Ganom Date: Fri, 2 Aug 2019 18:58:40 -0400 Subject: [PATCH 3/3] Fix flexo not updating when it should. --- .../net/runelite/client/plugins/flexo/FlexoPlugin.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java index a8a8cdcaa5..38a38b2255 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java @@ -143,13 +143,11 @@ public class FlexoPlugin extends Plugin private void onConfigChanged(ConfigChanged event) { - if (!event.getGroup().equals("flexo") || (!event.getGroup().equals("stretchedmode")) ) + if (event.getGroup().equals("flexo") || event.getGroup().equals("stretchedmode")) { - return; + updateConfig(); + updateMouseMotionFactory(); } - - updateConfig(); - updateMouseMotionFactory(); } private void onBeforeRender(BeforeRender event)