From 03054e065e364b98aa064d2c37e3b712120b3240 Mon Sep 17 00:00:00 2001 From: zeruth Date: Thu, 16 May 2019 00:53:01 -0400 Subject: [PATCH] Revert Performance refactor Ping will be broken off into it's own plugin at a later time. --- .../PerformanceConfig.java => fps/FpsConfig.java} | 6 +++--- .../{performance => fps}/FpsDrawListener.java | 6 +++--- .../plugins/{performance => fps}/FpsLimitMode.java | 2 +- .../FpsOverlay.java} | 10 +++++----- .../PerformancePlugin.java => fps/FpsPlugin.java} | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) rename runelite-client/src/main/java/net/runelite/client/plugins/{performance/PerformanceConfig.java => fps/FpsConfig.java} (94%) rename runelite-client/src/main/java/net/runelite/client/plugins/{performance => fps}/FpsDrawListener.java (97%) rename runelite-client/src/main/java/net/runelite/client/plugins/{performance => fps}/FpsLimitMode.java (96%) rename runelite-client/src/main/java/net/runelite/client/plugins/{performance/PerformanceOverlay.java => fps/FpsOverlay.java} (94%) rename runelite-client/src/main/java/net/runelite/client/plugins/{performance/PerformancePlugin.java => fps/FpsPlugin.java} (92%) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformanceConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java similarity index 94% rename from runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformanceConfig.java rename to runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java index 2a344451dc..0627f90354 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformanceConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java @@ -22,14 +22,14 @@ * (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.performance; +package net.runelite.client.plugins.fps; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -@ConfigGroup(PerformancePlugin.CONFIG_GROUP_KEY) -public interface PerformanceConfig extends Config +@ConfigGroup(FpsPlugin.CONFIG_GROUP_KEY) +public interface FpsConfig extends Config { @ConfigItem( keyName = "limitMode", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performance/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java similarity index 97% rename from runelite-client/src/main/java/net/runelite/client/plugins/performance/FpsDrawListener.java rename to runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java index ff1479968a..3be17f5577 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performance/FpsDrawListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java @@ -22,7 +22,7 @@ * (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.performance; +package net.runelite.client.plugins.fps; import javax.inject.Inject; import net.runelite.api.events.FocusChanged; @@ -44,7 +44,7 @@ public class FpsDrawListener implements Runnable { private static final int SAMPLE_SIZE = 4; - private final PerformanceConfig config; + private final FpsConfig config; private long targetDelay = 0; @@ -58,7 +58,7 @@ public class FpsDrawListener implements Runnable private long sleepDelay = 0; @Inject - private FpsDrawListener(PerformanceConfig config) + private FpsDrawListener(FpsConfig config) { this.config = config; reloadConfig(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performance/FpsLimitMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java similarity index 96% rename from runelite-client/src/main/java/net/runelite/client/plugins/performance/FpsLimitMode.java rename to runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java index 78485efec5..2709ccf83e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performance/FpsLimitMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsLimitMode.java @@ -22,7 +22,7 @@ * (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.performance; +package net.runelite.client.plugins.fps; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformanceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java similarity index 94% rename from runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformanceOverlay.java rename to runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java index 192e4dea86..559d0ea2d3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformanceOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java @@ -22,7 +22,7 @@ * (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.performance; +package net.runelite.client.plugins.fps; import java.awt.Color; import java.awt.Dimension; @@ -47,18 +47,18 @@ import net.runelite.client.ui.overlay.OverlayUtil; * This locks "FPS:" into one position (the far top right corner of the canvas), * along with a locked position for the FPS value. */ -public class PerformanceOverlay extends Overlay +public class FpsOverlay extends Overlay { // Local dependencies - private final PerformanceConfig config; + private final FpsConfig config; private final Client client; - private final PerformancePlugin plugin; + private final FpsPlugin plugin; // Often changing values private boolean isFocused = true; @Inject - private PerformanceOverlay(PerformancePlugin plugin, PerformanceConfig config, Client client) + private FpsOverlay(FpsPlugin plugin, FpsConfig config, Client client) { this.config = config; this.client = client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java similarity index 92% rename from runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformancePlugin.java rename to runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java index e93e23e769..e2e3484f3b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performance/PerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java @@ -22,7 +22,7 @@ * (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.performance; +package net.runelite.client.plugins.fps; import com.google.inject.Inject; import com.google.inject.Provides; @@ -63,7 +63,7 @@ import net.runelite.client.util.ping.Ping; tags = {"frames", "framerate", "limit", "overlay", "ping"}, enabledByDefault = false ) -public class PerformancePlugin extends Plugin +public class FpsPlugin extends Plugin { static final String CONFIG_GROUP_KEY = "fpscontrol"; @@ -74,7 +74,7 @@ public class PerformancePlugin extends Plugin private OverlayManager overlayManager; @Inject - private PerformanceOverlay overlay; + private FpsOverlay overlay; @Inject private FpsDrawListener drawListener; @@ -86,14 +86,14 @@ public class PerformancePlugin extends Plugin private Client client; @Inject - private PerformanceConfig performanceConfig; + private FpsConfig fpsConfig; private final ScheduledExecutorService pingExecutorService = new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor()); @Provides - PerformanceConfig provideConfig(ConfigManager configManager) + FpsConfig provideConfig(ConfigManager configManager) { - return configManager.getConfig(PerformanceConfig.class); + return configManager.getConfig(FpsConfig.class); } @Subscribe @@ -131,7 +131,7 @@ public class PerformancePlugin extends Plugin private void getPingToCurrentWorld() { - if (client.getGameState().equals(GameState.LOGGED_IN) && performanceConfig.drawPing()) + if (client.getGameState().equals(GameState.LOGGED_IN) && fpsConfig.drawPing()) { ping = Ping.ping(String.format("oldschool%d.runescape.com", client.getWorld() - 300)); }