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

Use the PluginType enum in ConfigPanel

Browse Source
This commit is contained in:
Scott Burns
2019-04-22 22:35:37 +02:00
parent 1cbd7a9e5c
commit d63d125df2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginInstantiationException; import net.runelite.client.plugins.PluginInstantiationException;
import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginManager;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.plugins.pluginsorter.PluginSorterPlugin; import net.runelite.client.plugins.pluginsorter.PluginSorterPlugin;
import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.ColorScheme;
import net.runelite.client.ui.DynamicGridLayout; import net.runelite.client.ui.DynamicGridLayout;
@@ -219,7 +220,7 @@ public class ConfigPanel extends PluginPanel
List<PluginListItem> pvmPlugins = new ArrayList<>(); List<PluginListItem> pvmPlugins = new ArrayList<>();
// populate pluginList with all PVM Plugins // populate pluginList with all PVM Plugins
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVM))
.forEach(plugin -> .forEach(plugin ->
{ {
final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
@@ -239,7 +240,7 @@ public class ConfigPanel extends PluginPanel
List<PluginListItem> pvpPlugins = new ArrayList<>(); List<PluginListItem> pvpPlugins = new ArrayList<>();
// populate pluginList with all PVP Plugins // populate pluginList with all PVP Plugins
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVP))
.forEach(plugin -> .forEach(plugin ->
{ {
final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
@@ -259,7 +260,7 @@ public class ConfigPanel extends PluginPanel
List<PluginListItem> utilPlugins = new ArrayList<>(); List<PluginListItem> utilPlugins = new ArrayList<>();
// populate pluginList with all utility Plugins // populate pluginList with all utility Plugins
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY))
.forEach(plugin -> .forEach(plugin ->
{ {
final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
@@ -287,10 +288,10 @@ public class ConfigPanel extends PluginPanel
List<PluginListItem> vanillaPlugins = new ArrayList<>(); List<PluginListItem> vanillaPlugins = new ArrayList<>();
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).hidden()) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).hidden())
.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVM))
.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PVP))
.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.UTILITY))
.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("pluginOrganizer")) .filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PLUGIN_ORGANIZER))
.forEach(plugin -> .forEach(plugin ->
{ {
final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
@@ -322,7 +323,7 @@ public class ConfigPanel extends PluginPanel
// Add plugin sorter to bottom // Add plugin sorter to bottom
pluginManager.getPlugins().stream() pluginManager.getPlugins().stream()
.filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals("pluginOrganizer")) .filter(plugin -> plugin.getClass().getAnnotation(PluginDescriptor.class).type().equals(PluginType.PLUGIN_ORGANIZER))
.forEach(plugin -> .forEach(plugin ->
{ {
final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);