ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Cleanup ConfigPanel and remove spam

Browse Source
This commit is contained in:
Scott Burns
2019-05-16 02:28:48 +02:00
parent 16de0c559e
commit 01aa20308c
1 changed files with 58 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

@@ -206,7 +206,7 @@ public class ConfigPanel extends PluginPanel
List<PluginListItem> externalPlugins = new ArrayList<>(); List<PluginListItem> externalPlugins = new ArrayList<>();
// populate pluginList with all external Plugins // populate pluginList with all external Plugins
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type()==PluginType.EXTERNAL) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.EXTERNAL))
.forEach(plugin -> .forEach(plugin ->
{ {
final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
@@ -214,17 +214,16 @@ public class ConfigPanel extends PluginPanel
final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor);
System.out.println("Started "+listItem.getName());
listItem.setPinned(pinnedPlugins.contains(listItem.getName())); listItem.setPinned(pinnedPlugins.contains(listItem.getName()));
externalPlugins.add(listItem); externalPlugins.add(listItem);
}); });
externalPlugins.sort(Comparator.comparing(PluginListItem::getName)); externalPlugins.sort(Comparator.comparing(PluginListItem::getName));
for (PluginListItem plugin : externalPlugins) pluginList.addAll(externalPlugins);
pluginList.add(plugin);
List<PluginListItem> pvmPlugins = new ArrayList<>(); List<PluginListItem> pvmPlugins = new ArrayList<>();
// populate pluginList with all PVM Plugins
// populate pluginList with all non-hidden plugins
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVM)) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVM))
.forEach(plugin -> .forEach(plugin ->
@@ -234,14 +233,12 @@ public class ConfigPanel extends PluginPanel
final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor);
System.out.println("Started "+listItem.getName());
listItem.setPinned(pinnedPlugins.contains(listItem.getName())); listItem.setPinned(pinnedPlugins.contains(listItem.getName()));
pvmPlugins.add(listItem); pvmPlugins.add(listItem);
}); });
pvmPlugins.sort(Comparator.comparing(PluginListItem::getName)); pvmPlugins.sort(Comparator.comparing(PluginListItem::getName));
for (PluginListItem plugin : pvmPlugins) pluginList.addAll(pvmPlugins);
pluginList.add(plugin);
List<PluginListItem> pvpPlugins = new ArrayList<>(); List<PluginListItem> pvpPlugins = new ArrayList<>();
// populate pluginList with all PVP Plugins // populate pluginList with all PVP Plugins
@@ -254,17 +251,15 @@ public class ConfigPanel extends PluginPanel
final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor);
System.out.println("Started "+listItem.getName());
listItem.setPinned(pinnedPlugins.contains(listItem.getName())); listItem.setPinned(pinnedPlugins.contains(listItem.getName()));
pvpPlugins.add(listItem); pvpPlugins.add(listItem);
}); });
pvpPlugins.sort(Comparator.comparing(PluginListItem::getName)); pvpPlugins.sort(Comparator.comparing(PluginListItem::getName));
for (PluginListItem plugin : pvpPlugins) pluginList.addAll(pvpPlugins);
pluginList.add(plugin);
List<PluginListItem> utilPlugins = new ArrayList<>(); List<PluginListItem> utilPlugins = new ArrayList<>();
// populate pluginList with all utility Plugins // populate pluginList with all PVP Plugins
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY)) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY))
.forEach(plugin -> .forEach(plugin ->
@@ -274,14 +269,12 @@ public class ConfigPanel extends PluginPanel
final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor);
System.out.println("Started "+listItem.getName());
listItem.setPinned(pinnedPlugins.contains(listItem.getName())); listItem.setPinned(pinnedPlugins.contains(listItem.getName()));
utilPlugins.add(listItem); utilPlugins.add(listItem);
}); });
utilPlugins.sort(Comparator.comparing(PluginListItem::getName)); utilPlugins.sort(Comparator.comparing(PluginListItem::getName));
for (PluginListItem plugin : utilPlugins) pluginList.addAll(utilPlugins);
pluginList.add(plugin);
// populate pluginList with all vanilla RL plugins // populate pluginList with all vanilla RL plugins
List<PluginListItem> vanillaPlugins = new ArrayList<>(); List<PluginListItem> vanillaPlugins = new ArrayList<>();
@@ -312,8 +305,7 @@ public class ConfigPanel extends PluginPanel
vanillaPlugins.add(chatColor); vanillaPlugins.add(chatColor);
vanillaPlugins.sort(Comparator.comparing(PluginListItem::getName)); vanillaPlugins.sort(Comparator.comparing(PluginListItem::getName));
for (PluginListItem plugin : vanillaPlugins) pluginList.addAll(vanillaPlugins);
pluginList.add(plugin);
// Add plugin sorter to bottom // Add plugin sorter to bottom
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
@@ -325,7 +317,6 @@ public class ConfigPanel extends PluginPanel
final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config); final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor); final PluginListItem listItem = new PluginListItem(this, configManager, plugin, descriptor, config, configDescriptor);
System.out.println("Started "+listItem.getName());
pluginList.add(listItem); pluginList.add(listItem);
}); });
} }