From febc53eb769b31d6f5d27b27b64930c208eae595 Mon Sep 17 00:00:00 2001 From: zeruth Date: Mon, 22 Apr 2019 17:53:37 -0400 Subject: [PATCH] Update ConfigPanel.java Minor improvements to plugin panel. -Moves RuneLite config to top, as it should have always been -Fixes external plugins mis-sorting -Fixes colors of the 2 core plugins (RuneLite and Chat Colors) --- .../client/plugins/config/ConfigPanel.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 4037f639d1..68d70d0b77 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -197,10 +197,18 @@ public class ConfigPanel extends PluginPanel { final List pinnedPlugins = getPinnedPluginNames(); + // set RuneLite config on top, as it should always have been + final PluginListItem runeLite = new PluginListItem(this, configManager, runeLiteConfig, + configManager.getConfigDescriptor(runeLiteConfig), + RUNELITE_PLUGIN, "RuneLite client settings", "client"); + runeLite.setPinned(pinnedPlugins.contains(RUNELITE_PLUGIN)); + runeLite.nameLabel.setForeground(Color.WHITE); + pluginList.add(runeLite); + List externalPlugins = new ArrayList<>(); // populate pluginList with all external Plugins pluginManager.getPlugins().stream() - .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("external")) + .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type()==PluginType.EXTERNAL) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); @@ -292,6 +300,7 @@ public class ConfigPanel extends PluginPanel .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVP)) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY)) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PLUGIN_ORGANIZER)) + .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.EXTERNAL)) .forEach(plugin -> { final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); @@ -304,22 +313,16 @@ public class ConfigPanel extends PluginPanel } ); - vanillaPlugins.sort(Comparator.comparing(PluginListItem::getName)); - for (PluginListItem plugin : vanillaPlugins) - pluginList.add(plugin); - - // add special entries for core client configurations - final PluginListItem runeLite = new PluginListItem(this, configManager, runeLiteConfig, - configManager.getConfigDescriptor(runeLiteConfig), - RUNELITE_PLUGIN, "RuneLite client settings", "client"); - runeLite.setPinned(pinnedPlugins.contains(RUNELITE_PLUGIN)); - pluginList.add(runeLite); - final PluginListItem chatColor = new PluginListItem(this, configManager, chatColorConfig, configManager.getConfigDescriptor(chatColorConfig), CHAT_COLOR_PLUGIN, "Recolor chat text", "colour", "messages"); chatColor.setPinned(pinnedPlugins.contains(CHAT_COLOR_PLUGIN)); - pluginList.add(chatColor); + chatColor.nameLabel.setForeground(Color.WHITE); + vanillaPlugins.add(chatColor); + + vanillaPlugins.sort(Comparator.comparing(PluginListItem::getName)); + for (PluginListItem plugin : vanillaPlugins) + pluginList.add(plugin); // Add plugin sorter to bottom pluginManager.getPlugins().stream()