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

external: Get plugin version from descriptor

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-12 02:10:00 +02:00
parent d0d7a7f3dc
commit fb81eb912c
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
View File

@@ -118,7 +118,6 @@ public class ExternalPluginManager
private final Groups groups; private final Groups groups;
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
private UpdateManager updateManager; private UpdateManager updateManager;
private Map<String, PluginInfo.PluginRelease> lastPluginRelease = new HashMap<>();
private Set<PluginType> pluginTypes = Set.of(PluginType.values()); private Set<PluginType> pluginTypes = Set.of(PluginType.values());
@Inject @Inject
@@ -425,11 +424,6 @@ public class ExternalPluginManager
externalPluginManager.setSystemVersion(SYSTEM_VERSION); externalPluginManager.setSystemVersion(SYSTEM_VERSION);
} }
public boolean developmentMode()
{
return externalPluginManager.isDevelopment();
}
public boolean doesGhRepoExist(String owner, String name) public boolean doesGhRepoExist(String owner, String name)
{ {
return doesRepoExist("gh:" + owner + "/" + name); return doesRepoExist("gh:" + owner + "/" + name);
@@ -933,7 +927,6 @@ public class ExternalPluginManager
pluginsInfoMap.remove(plugin.getClass().getSimpleName()); pluginsInfoMap.remove(plugin.getClass().getSimpleName());
AtomicReference<String> support = new AtomicReference<>(""); AtomicReference<String> support = new AtomicReference<>("");
AtomicReference<String> version = new AtomicReference<>("");
updateManager.getRepositories().forEach(repository -> updateManager.getRepositories().forEach(repository ->
repository.getPlugins().forEach((key, value) -> repository.getPlugins().forEach((key, value) ->
@@ -941,23 +934,6 @@ public class ExternalPluginManager
if (key.equals(pluginId)) if (key.equals(pluginId))
{ {
support.set(value.projectUrl); support.set(value.projectUrl);
for (PluginInfo.PluginRelease release : value.releases)
{
if (externalPluginManager.getSystemVersion().equals("0.0.0") || externalPluginManager.getVersionManager().checkVersionConstraint(externalPluginManager.getSystemVersion(), release.requires))
{
if (lastPluginRelease.get(pluginId) == null)
{
lastPluginRelease.put(pluginId, release);
}
else if (externalPluginManager.getVersionManager().compareVersions(release.version, lastPluginRelease.get(pluginId).version) > 0)
{
lastPluginRelease.put(pluginId, release);
}
}
}
version.set(lastPluginRelease.get(pluginId).version);
} }
})); }));
@@ -965,7 +941,7 @@ public class ExternalPluginManager
plugin.getClass().getSimpleName(), plugin.getClass().getSimpleName(),
new HashMap<>() new HashMap<>()
{{ {{
put("version", version.get()); put("version", externalPluginManager.getPlugin(pluginId).getDescriptor().getVersion());
put("id", externalPluginManager.getPlugin(pluginId).getDescriptor().getPluginId()); put("id", externalPluginManager.getPlugin(pluginId).getDescriptor().getPluginId());
put("provider", externalPluginManager.getPlugin(pluginId).getDescriptor().getProvider()); put("provider", externalPluginManager.getPlugin(pluginId).getDescriptor().getProvider());
put("support", support.get()); put("support", support.get());