From 1dfcfd346822f83ee8601054b85e5fc14e92303a Mon Sep 17 00:00:00 2001 From: Lotto Date: Sat, 19 May 2018 22:45:16 +0200 Subject: [PATCH] client: use Image instead of BufferedImage --- .../client/plugins/fps/FpsDrawListener.java | 6 +++--- .../plugins/screenshot/ScreenshotOverlay.java | 7 ++++--- .../plugins/screenshot/ScreenshotPlugin.java | 5 +++-- .../net/runelite/client/ui/DrawManager.java | 18 +++++++++--------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java index 1deade0ea7..8c9957f739 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.fps; -import java.awt.image.BufferedImage; +import java.awt.Image; import java.util.function.Consumer; import javax.inject.Inject; import net.runelite.api.events.FocusChanged; @@ -42,7 +42,7 @@ import net.runelite.api.events.FocusChanged; * Enforcing FPS in the draw code does not impact the client engine's ability to run including its audio, * even when forced to 1 FPS with this plugin. */ -public class FpsDrawListener implements Consumer +public class FpsDrawListener implements Consumer { private static final int SAMPLE_SIZE = 4; @@ -90,7 +90,7 @@ public class FpsDrawListener implements Consumer } @Override - public void accept(BufferedImage bufferedImage) + public void accept(Image image) { if (!isEnforced()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java index ff08300e3c..69357d5bdb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java @@ -29,6 +29,7 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; +import java.awt.Image; import java.awt.image.BufferedImage; import java.io.IOException; import java.text.DateFormat; @@ -74,7 +75,7 @@ public class ScreenshotOverlay extends Overlay private final Client client; private final DrawManager drawManager; - private final Queue> consumers = new ConcurrentLinkedQueue<>(); + private final Queue> consumers = new ConcurrentLinkedQueue<>(); @Inject public ScreenshotOverlay(Client client, DrawManager drawManager) @@ -118,7 +119,7 @@ public class ScreenshotOverlay extends Overlay // Request the queued screenshots to be taken, // now that the timestamp is visible. - Consumer consumer; + Consumer consumer; while ((consumer = consumers.poll()) != null) { drawManager.requestNextFrameListener(consumer); @@ -127,7 +128,7 @@ public class ScreenshotOverlay extends Overlay return null; } - public void queueForTimestamp(Consumer screenshotConsumer) + public void queueForTimestamp(Consumer screenshotConsumer) { if (REPORT_BUTTON == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 3d9c3668a9..6034d6bc7b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -30,6 +30,7 @@ import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Desktop; import java.awt.Graphics; +import java.awt.Image; import java.awt.Toolkit; import java.awt.TrayIcon; import java.awt.datatransfer.Clipboard; @@ -409,11 +410,11 @@ public class ScreenshotPlugin extends Plugin return; } - Consumer screenshotConsumer = image -> + Consumer screenshotConsumer = image -> { BufferedImage screenshot = config.includeFrame() ? new BufferedImage(clientUi.getWidth(), clientUi.getHeight(), BufferedImage.TYPE_INT_ARGB) - : new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB); + : new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB); Graphics graphics = screenshot.getGraphics(); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/DrawManager.java b/runelite-client/src/main/java/net/runelite/client/ui/DrawManager.java index 80dd22b8ea..fc31d90696 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/DrawManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/DrawManager.java @@ -24,7 +24,7 @@ */ package net.runelite.client.ui; -import java.awt.image.BufferedImage; +import java.awt.Image; import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -37,10 +37,10 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class DrawManager { - private final List> everyFrame = new CopyOnWriteArrayList<>(); - private final Queue> nextFrame = new ConcurrentLinkedQueue<>(); + private final List> everyFrame = new CopyOnWriteArrayList<>(); + private final Queue> nextFrame = new ConcurrentLinkedQueue<>(); - public void registerEveryFrameListener(Consumer everyFrameListener) + public void registerEveryFrameListener(Consumer everyFrameListener) { if (!everyFrame.contains(everyFrameListener)) { @@ -48,19 +48,19 @@ public class DrawManager } } - public void unregisterEveryFrameListener(Consumer everyFrameListener) + public void unregisterEveryFrameListener(Consumer everyFrameListener) { everyFrame.remove(everyFrameListener); } - public void requestNextFrameListener(Consumer nextFrameListener) + public void requestNextFrameListener(Consumer nextFrameListener) { nextFrame.add(nextFrameListener); } - public void processDrawComplete(BufferedImage image) + public void processDrawComplete(Image image) { - for (Consumer everyFrameListener : everyFrame) + for (Consumer everyFrameListener : everyFrame) { try { @@ -72,7 +72,7 @@ public class DrawManager } } - Consumer nextFrameListener = nextFrame.poll(); + Consumer nextFrameListener = nextFrame.poll(); while (nextFrameListener != null) { try