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

Merge pull request #2922 from open-osrs/externals-filter-constraint

Browse Source 
externals: Filter out available plugins that do not constraint to the API version
This commit is contained in:
Tyler Bochard
2021-02-19 13:43:05 -05:00
committed by GitHub
parent 71a7725e31 8ea338dace
commit f74674bc26
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java
View File

@@ -98,6 +98,7 @@ public class OPRSExternalPluginManager
public static ArrayList<ClassLoader> pluginClassLoaders = new ArrayList<>(); public static ArrayList<ClassLoader> pluginClassLoaders = new ArrayList<>();
private final PluginManager runelitePluginManager; private final PluginManager runelitePluginManager;
@Getter(AccessLevel.PUBLIC)
private org.pf4j.PluginManager externalPluginManager; private org.pf4j.PluginManager externalPluginManager;
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
private final List<UpdateRepository> repositories = new ArrayList<>(); private final List<UpdateRepository> repositories = new ArrayList<>();

10
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/PluginsPanel.java vendored
View File

@@ -44,6 +44,7 @@ import net.runelite.client.ui.components.IconTextField;
import net.runelite.client.ui.components.shadowlabel.JShadowedLabel; import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.SwingUtil; import net.runelite.client.util.SwingUtil;
import org.pf4j.VersionManager;
import org.pf4j.update.PluginInfo; import org.pf4j.update.PluginInfo;
import org.pf4j.update.UpdateManager; import org.pf4j.update.UpdateManager;
import org.pf4j.update.UpdateRepository; import org.pf4j.update.UpdateRepository;
@@ -82,6 +83,7 @@ public class PluginsPanel extends JPanel
} }
private final OPRSExternalPluginManager externalPluginManager; private final OPRSExternalPluginManager externalPluginManager;
private final VersionManager versionManager;
private final UpdateManager updateManager; private final UpdateManager updateManager;
private final IconTextField searchBar = new IconTextField(); private final IconTextField searchBar = new IconTextField();
@@ -97,6 +99,7 @@ public class PluginsPanel extends JPanel
PluginsPanel(OPRSExternalPluginManager externalPluginManager, EventBus eventBus) PluginsPanel(OPRSExternalPluginManager externalPluginManager, EventBus eventBus)
{ {
this.externalPluginManager = externalPluginManager; this.externalPluginManager = externalPluginManager;
this.versionManager = externalPluginManager.getExternalPluginManager().getVersionManager();
this.updateManager = externalPluginManager.getUpdateManager(); this.updateManager = externalPluginManager.getUpdateManager();
setLayout(new BorderLayout(0, 10)); setLayout(new BorderLayout(0, 10));
@@ -405,6 +408,13 @@ public class PluginsPanel extends JPanel
for (PluginInfo pluginInfo : availablePluginsList) for (PluginInfo pluginInfo : availablePluginsList)
{ {
if (pluginInfo.releases
.stream()
.noneMatch((pluginRelease) -> versionManager.checkVersionConstraint(externalPluginManager.getExternalPluginManager().getSystemVersion(), pluginRelease.requires)))
{
continue;
}
if (!search.equals("") && mismatchesSearchTerms(search, pluginInfo)) if (!search.equals("") && mismatchesSearchTerms(search, pluginInfo))
{ {
continue; continue;