diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java index 58ae48d894..05a5d9aa6c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java @@ -118,7 +118,6 @@ public class ExternalPluginManager private final Groups groups; @Getter(AccessLevel.PUBLIC) private UpdateManager updateManager; - private Map lastPluginRelease = new HashMap<>(); private Set pluginTypes = Set.of(PluginType.values()); @Inject @@ -425,11 +424,6 @@ public class ExternalPluginManager externalPluginManager.setSystemVersion(SYSTEM_VERSION); } - public boolean developmentMode() - { - return externalPluginManager.isDevelopment(); - } - public boolean doesGhRepoExist(String owner, String name) { return doesRepoExist("gh:" + owner + "/" + name); @@ -933,7 +927,6 @@ public class ExternalPluginManager pluginsInfoMap.remove(plugin.getClass().getSimpleName()); AtomicReference support = new AtomicReference<>(""); - AtomicReference version = new AtomicReference<>(""); updateManager.getRepositories().forEach(repository -> repository.getPlugins().forEach((key, value) -> @@ -941,23 +934,6 @@ public class ExternalPluginManager if (key.equals(pluginId)) { 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(), new HashMap<>() {{ - put("version", version.get()); + put("version", externalPluginManager.getPlugin(pluginId).getDescriptor().getVersion()); put("id", externalPluginManager.getPlugin(pluginId).getDescriptor().getPluginId()); put("provider", externalPluginManager.getPlugin(pluginId).getDescriptor().getProvider()); put("support", support.get()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 92139785af..60b7bed213 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -27,11 +27,14 @@ package net.runelite.client.plugins.config; import com.google.common.base.Splitter; import com.google.common.base.Strings; +import java.awt.BasicStroke; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Font; +import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.GridLayout; import java.awt.Insets; import java.awt.event.FocusAdapter; @@ -62,6 +65,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JScrollPane; +import javax.swing.JSeparator; import javax.swing.JSlider; import javax.swing.JSpinner; import javax.swing.JTextArea; @@ -466,9 +470,23 @@ class ConfigPanel extends PluginPanel JButton button = new JButton("Support"); button.addActionListener(e -> LinkBrowser.browse(pluginInfo.get("support"))); - buttons.add(button); + + JSeparator separator = new JSeparator() + { + @Override + protected void paintComponent(Graphics g) + { + int width = this.getSize().width; + Graphics2D g2 = (Graphics2D) g; + g2.setStroke(new BasicStroke(2)); + g2.setColor(ColorScheme.BRAND_BLUE); + g2.drawLine(0, 0, width, 0); + } + }; mainPanel.add(infoPanel); + mainPanel.add(button); + mainPanel.add(separator); } getSections(cd);