From 01a3ed82f8495c62196b07de08e483616485c1d1 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 1 Feb 2018 17:42:21 -0500 Subject: [PATCH] Revert "runelite-client: remove teamcape plugin" We believe the teamcape plugin has equivalents in both OSBuddy and Konduit, and so are readding it on the principle that rules should not be selectively enforced on clients. --- .../plugins/teamcapes/TeamCapesConfig.java | 47 +++++++ .../plugins/teamcapes/TeamCapesOverlay.java | 78 +++++++++++ .../plugins/teamcapes/TeamCapesPlugin.java | 122 ++++++++++++++++++ 3 files changed, 247 insertions(+) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesConfig.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesConfig.java new file mode 100644 index 0000000000..872dcb66a3 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesConfig.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2017, Devin French + * 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.teamcapes; + +import net.runelite.client.config.Config; +import net.runelite.client.config.ConfigGroup; +import net.runelite.client.config.ConfigItem; + +@ConfigGroup( + keyName = "teamcapes", + name = "Team Capes", + description = "Configuration for the team capes plugin" +) +public interface TeamCapesConfig extends Config +{ + @ConfigItem( + keyName = "enabled", + name = "Enabled", + description = "Configures whether or not team cape info is displayed" + ) + default boolean enabled() + { + return false; + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java new file mode 100644 index 0000000000..9844f69224 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2017, Devin French + * 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.teamcapes; + +import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.OverlayPriority; +import net.runelite.client.ui.overlay.components.PanelComponent; + +import javax.inject.Inject; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.Point; +import java.util.Map; + +public class TeamCapesOverlay extends Overlay +{ + private final TeamCapesPlugin plugin; + private final TeamCapesConfig config; + private final PanelComponent panelComponent = new PanelComponent(); + + @Inject + TeamCapesOverlay(TeamCapesPlugin plugin, TeamCapesConfig config) + { + setPosition(OverlayPosition.TOP_LEFT); + setPriority(OverlayPriority.LOW); + this.plugin = plugin; + this.config = config; + } + + @Override + public Dimension render(Graphics2D graphics, Point parent) + { + if (!config.enabled()) + { + return null; + } + Map teams = plugin.getTeams(); + if (teams.isEmpty()) + { + return null; + } + panelComponent.getLines().clear(); + for (Map.Entry team : teams.entrySet()) + { + panelComponent.getLines().add(new PanelComponent.Line( + "Team-" + Integer.toString(team.getKey()), + Color.WHITE, + Integer.toString(team.getValue()), + Color.WHITE + )); + } + return panelComponent.render(graphics, parent); + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java new file mode 100644 index 0000000000..632cc25211 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2017, Devin French + * 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.teamcapes; + +import com.google.inject.Binder; +import com.google.inject.Provides; +import java.time.temporal.ChronoUnit; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.inject.Inject; +import net.runelite.api.Client; +import net.runelite.api.GameState; +import net.runelite.api.Player; +import net.runelite.client.config.ConfigManager; +import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.task.Schedule; +import net.runelite.client.ui.overlay.Overlay; + +@PluginDescriptor( + name = "Team capes plugin" +) +public class TeamCapesPlugin extends Plugin +{ + @Inject + Client client; + + @Inject + TeamCapesConfig config; + + @Inject + TeamCapesOverlay teamCapesOverlay; + + private Map teams = new HashMap<>(); + + @Override + public void configure(Binder binder) + { + binder.bind(TeamCapesOverlay.class); + } + + @Provides + TeamCapesConfig provideConfig(ConfigManager configManager) + { + return configManager.getConfig(TeamCapesConfig.class); + } + + @Override + public Overlay getOverlay() + { + return teamCapesOverlay; + } + + @Schedule( + period = 1800, + unit = ChronoUnit.MILLIS + ) + public void update() + { + if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN) + { + return; + } + List players = client.getPlayers(); + teams.clear(); + for (Player player : players) + { + int team = player.getTeam(); + if (team > 0) + { + if (teams.containsKey(team)) + { + teams.put(team, teams.get(team) + 1); + } + else + { + teams.put(team, 1); + } + } + } + // Sort teams by value in descending order and then by key in ascending order, limited to 5 entries + teams = teams.entrySet().stream() + .sorted( + Comparator.comparing(Map.Entry::getValue, Comparator.reverseOrder()) + .thenComparingInt(Map.Entry::getKey) + ) + .limit(5) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new)); + } + + public Map getTeams() + { + return teams; + } + +}