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

Merge pull request #2652 from LethalLeonard/RepositorySorting

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-03 07:25:51 +02:00
committed by GitHub
parent b5f6203432 6bb24a2bcc
commit 1868f69c42
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/config/OpenOSRSConfig.java
View File

@@ -40,7 +40,8 @@ public interface OpenOSRSConfig extends Config
enum SortStyle enum SortStyle
{ {
CATEGORY("Category"), CATEGORY("Category"),
ALPHABETICALLY("Alphabetically"); ALPHABETICALLY("Alphabetically"),
REPOSITORY("Repository");
private String name; private String name;

55
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
View File

@@ -364,6 +364,52 @@ public class PluginListPanel extends PluginPanel
sections.get(sectionName).add(pluginListItem); sections.get(sectionName).add(pluginListItem);
} }
populateSections(sections);
}
private void generatePluginListByRepo(List<PluginListItem> pluginListItems)
{
final Map<String, JPanel> sections = new HashMap<>();
for (PluginListItem pluginListItem : pluginListItems)
{
if (pluginListItem.isPinned())
{
if (!sections.containsKey("Pinned"))
{
sections.put("Pinned", addSection("Pinned"));
}
sections.get("Pinned").add(pluginListItem);
continue;
}
Plugin plugin = pluginListItem.getPluginConfig().getPlugin();
String sectionName;
try
{
Map<String, String> pluginInfoMap = externalPluginManager.getPluginsInfoMap().get(plugin.getClass().getSimpleName());
sectionName = pluginInfoMap.get("provider");
}
catch (NullPointerException e)
{
sectionName = "System";
}
if (!sections.containsKey(sectionName))
{
sections.put(sectionName, addSection(sectionName));
}
sections.get(sectionName).add(pluginListItem);
}
populateSections(sections);
}
private void populateSections(Map<String, JPanel> sections)
{
sections.forEach((key, value) -> sections.forEach((key, value) ->
{ {
Container parent = value.getParent(); Container parent = value.getParent();
@@ -386,7 +432,7 @@ public class PluginListPanel extends PluginPanel
if (text.isEmpty()) if (text.isEmpty())
{ {
if (openOSRSConfig.pluginSortMode() == OpenOSRSConfig.SortStyle.ALPHABETICALLY || !openOSRSConfig.enableCategories()) if (openOSRSConfig.pluginSortMode() == OpenOSRSConfig.SortStyle.ALPHABETICALLY || (!openOSRSConfig.enableCategories() && (openOSRSConfig.pluginSortMode() != OpenOSRSConfig.SortStyle.REPOSITORY)))
{ {
pluginList.stream().filter(item -> pinned == item.isPinned()).forEach(mainPanel::add); pluginList.stream().filter(item -> pinned == item.isPinned()).forEach(mainPanel::add);
} }
@@ -402,7 +448,7 @@ public class PluginListPanel extends PluginPanel
{ {
if (pinned == listItem.isPinned() && Text.matchesSearchTerms(searchTerms, listItem.getKeywords())) if (pinned == listItem.isPinned() && Text.matchesSearchTerms(searchTerms, listItem.getKeywords()))
{ {
if (openOSRSConfig.pluginSortMode() == OpenOSRSConfig.SortStyle.ALPHABETICALLY || !openOSRSConfig.enableCategories()) if (openOSRSConfig.pluginSortMode() == OpenOSRSConfig.SortStyle.ALPHABETICALLY || (!openOSRSConfig.enableCategories() && (openOSRSConfig.pluginSortMode() != OpenOSRSConfig.SortStyle.REPOSITORY)))
{ {
mainPanel.add(listItem); mainPanel.add(listItem);
} }
@@ -418,6 +464,11 @@ public class PluginListPanel extends PluginPanel
{ {
generatePluginList(plugins); generatePluginList(plugins);
} }
if (openOSRSConfig.pluginSortMode() == OpenOSRSConfig.SortStyle.REPOSITORY)
{
generatePluginListByRepo(plugins);
}
} }
void openConfigurationPanel(String configGroup) void openConfigurationPanel(String configGroup)