From bd584e85ec2c4f26069c86d9a3fb46877fd8f9a0 Mon Sep 17 00:00:00 2001 From: Tyler Hardy Date: Fri, 8 Dec 2017 17:00:49 -0600 Subject: [PATCH] Remove FPS plugin (deprecated by base osrs ::displayfps) --- .../client/plugins/fpsinfo/FPSOverlay.java | 95 ------------------- .../client/plugins/fpsinfo/FPSPlugin.java | 68 ------------- 2 files changed, 163 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSOverlay.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSPlugin.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSOverlay.java deleted file mode 100644 index 01dbbce22d..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSOverlay.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2017, Cameron Moberg - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.fpsinfo; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics2D; -import java.awt.geom.Rectangle2D; -import javax.annotation.Nullable; -import javax.inject.Inject; -import net.runelite.api.Client; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.OverlayPriority; - -public class FPSOverlay extends Overlay -{ - private final Client client; - private final FPSPlugin plugin; - - @Inject - public FPSOverlay(@Nullable Client client, FPSPlugin plugin) - { - super(OverlayPosition.DYNAMIC, OverlayPriority.HIGH); - this.client = client; - this.plugin = plugin; - } - - @Override - public Dimension render(Graphics2D graphics) - { - Font font = plugin.getFont(); - if (font != null) - { - graphics.setFont(font); - } - - FontMetrics fm = graphics.getFontMetrics(); - String str = String.valueOf(client.getFPS()); - - Widget xpOrb = client.getWidget(WidgetInfo.MINIMAP_XP_ORB); - if (xpOrb == null) - { - return null; - } - - Rectangle2D bounds = xpOrb.getBounds().getBounds2D(); - if (bounds.getX() <= 0) - { - return null; - } - - int x = (int) (bounds.getX() + ((bounds.getWidth() / 2) - (fm.stringWidth(str) / 2))); - int y = (int) (bounds.getY() - (fm.getHeight() / 2)); - - //outline - graphics.setColor(Color.BLACK); - graphics.drawString(str, x - 1, y + 1); - graphics.drawString(str, x - 1, y - 1); - graphics.drawString(str, x + 1, y + 1); - graphics.drawString(str, x + 1, y - 1); - - //actual text - graphics.setColor(Color.WHITE); - graphics.drawString(str, x, y); - - return new Dimension(fm.stringWidth(str), fm.getHeight()); - } -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSPlugin.java deleted file mode 100644 index 20d13716ef..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fpsinfo/FPSPlugin.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2017, Cameron Moberg - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.fpsinfo; - -import com.google.inject.Binder; -import java.awt.Font; -import javax.inject.Inject; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.ui.FontManager; -import net.runelite.client.ui.overlay.Overlay; - -@PluginDescriptor( - name = "Frames per second plugin" -) -public class FPSPlugin extends Plugin -{ - @Inject - FPSOverlay overlay; - - private Font font; - - @Override - public void configure(Binder binder) - { - binder.bind(FPSOverlay.class); - } - - @Override - protected void startUp() throws Exception - { - font = FontManager.getRunescapeFont() - .deriveFont(Font.BOLD, 16); - } - - @Override - public Overlay getOverlay() - { - return overlay; - } - - public Font getFont() - { - return font; - } -}