ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1215 from runelite-extended/flexo-peer

Browse Source 
flexo: remove peer references
This commit is contained in:
Tyler Bochard
2019-08-02 19:36:41 -04:00
committed by GitHub
parent 38f4142d37 656a36b04a
commit 7d15d9d3ff
2 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java
View File

@@ -41,16 +41,13 @@ import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.awt.Point; import java.awt.Point;
import java.awt.Robot; import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.event.InputEvent; import java.awt.event.InputEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.peer.RobotPeer;
import java.util.Random; import java.util.Random;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Constants; import net.runelite.api.Constants;
import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.ClientUI;
import sun.awt.ComponentFactory;
public class Flexo extends Robot public class Flexo extends Robot
{ {
@@ -65,7 +62,7 @@ public class Flexo extends Robot
public static int minDelay = 45; public static int minDelay = 45;
public static MouseMotionFactory currentMouseMotionFactory; public static MouseMotionFactory currentMouseMotionFactory;
public boolean pausedIndefinitely = false; public boolean pausedIndefinitely = false;
private RobotPeer peer; private Robot peer;
public Flexo() throws AWTException public Flexo() throws AWTException
{ {
@@ -79,35 +76,18 @@ public class Flexo extends Robot
private void init(GraphicsDevice screen) throws AWTException private void init(GraphicsDevice screen) throws AWTException
{ {
Toolkit toolkit = Toolkit.getDefaultToolkit(); try
if (toolkit instanceof ComponentFactory)
{ {
peer = ((ComponentFactory) toolkit).createRobot(this, screen); peer = new Robot();
RobotDisposer disposer = new RobotDisposer(peer); }
sun.java2d.Disposer.addRecord(anchor, disposer); catch (Exception e)
{
client.getLogger().error("Flexo not supported on this system configuration.");
} }
} }
private transient Object anchor = new Object(); 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) private void pauseMS(int delayMS)
{ {
long initialMS = System.currentTimeMillis(); long initialMS = System.currentTimeMillis();
@@ -313,10 +293,9 @@ public class Flexo extends Robot
} }
@Override
public Color getPixelColor(int x, int y) public Color getPixelColor(int x, int y)
{ {
return new Color(peer.getRGBPixel(x, y)); return peer.getPixelColor(x, y);
} }
@Override @Override

8
runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
View File

@@ -143,13 +143,11 @@ public class FlexoPlugin extends Plugin
private void onConfigChanged(ConfigChanged event) 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) private void onBeforeRender(BeforeRender event)