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

externals: Filter out available plugins that do not constraint to the API version

Browse Source
This commit is contained in:
Owain van Brakel
2021-02-19 16:06:56 +01:00
parent 07f512edef
commit 8ea338dace
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

@@ -45,6 +45,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;
@@ -83,6 +84,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 ScheduledExecutorService executor; private final ScheduledExecutorService executor;
private final EventBus eventBus; private final EventBus eventBus;
@@ -100,6 +102,7 @@ public class PluginsPanel extends JPanel
PluginsPanel(OPRSExternalPluginManager externalPluginManager, ScheduledExecutorService executor, EventBus eventBus) PluginsPanel(OPRSExternalPluginManager externalPluginManager, ScheduledExecutorService executor, EventBus eventBus)
{ {
this.externalPluginManager = externalPluginManager; this.externalPluginManager = externalPluginManager;
this.versionManager = externalPluginManager.getExternalPluginManager().getVersionManager();
this.updateManager = externalPluginManager.getUpdateManager(); this.updateManager = externalPluginManager.getUpdateManager();
this.executor = executor; this.executor = executor;
this.eventBus = eventBus; this.eventBus = eventBus;
@@ -410,6 +413,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;