diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java index 7061b6a439..8199cf0502 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java @@ -2,6 +2,7 @@ package net.runelite.client.plugins; public enum PluginType { + RUNELITPLUS, PVM, PVP, SKILLING, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java index 0bed8eb58f..8171a85130 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java @@ -36,6 +36,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.PluginChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -84,16 +85,21 @@ public class PluginSorterPlugin extends Plugin } @Subscribe - public void onGameStateChanged(GameStateChanged gameStateChanged) + public void onPluginChanged(PluginChanged pluginChanged) { - if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) + validatePlugins(); + } + + public void validatePlugins() { + if (this.hidePlugins) { - if (config.hidePlugins()) - { - hidePlugins(); - } - updateColors(); + hidePlugins(); } + else + { + showPlugins(); + } + updateColors(); } @Subscribe @@ -108,16 +114,8 @@ public class PluginSorterPlugin extends Plugin if (configChanged.getKey().equals("hidePlugins")) { - if (this.hidePlugins) - { - hidePlugins(); - } - else - { - showPlugins(); - } + validatePlugins(); } - updateColors(); } private void updateColors() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index c7a807d395..a3940747de 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -55,7 +55,7 @@ import net.runelite.client.ui.ClientUI; hidden = true, // prevent users from disabling name = "RuneLitePlus", description = "Configures various aspects of RuneLitePlus", - type = PluginType.UTILITY + type = PluginType.RUNELITPLUS ) @Singleton @Slf4j