Merge pull request #590 from Kamielvf/teamcape-update

Update team cape plugin to make use of new plugin panel toggles

runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesConfig.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017, Devin French <https://github.com/devinfrench>
- * 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;
-	}
-}

runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java

@@ -39,25 +39,19 @@ 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)
+	TeamCapesOverlay(TeamCapesPlugin plugin)
 	{
 		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<Integer, Integer> teams = plugin.getTeams();
 		if (teams.isEmpty())
 		{

runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java

@@ -25,7 +25,6 @@
 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;
@@ -37,7 +36,6 @@ 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;
@@ -51,9 +49,6 @@ public class TeamCapesPlugin extends Plugin
 	@Inject
 	private Client client;
 
-	@Inject
-	private TeamCapesConfig config;
-
 	@Inject
 	private TeamCapesOverlay teamCapesOverlay;
 
@@ -65,25 +60,25 @@ public class TeamCapesPlugin extends Plugin
 		binder.bind(TeamCapesOverlay.class);
 	}
 
-	@Provides
-	TeamCapesConfig provideConfig(ConfigManager configManager)
-	{
-		return configManager.getConfig(TeamCapesConfig.class);
-	}
-
 	@Override
 	public Overlay getOverlay()
 	{
 		return teamCapesOverlay;
 	}
 
+	@Override
+	protected void shutDown() throws Exception
+	{
+		teams.clear();
+	}
+
 	@Schedule(
 		period = 1800,
 		unit = ChronoUnit.MILLIS
 	)
 	public void update()
 	{
-		if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN)
+		if (client.getGameState() != GameState.LOGGED_IN)
 		{
 			return;
 		}