Add reload version list button when version list fails to load

Author: PhoenixVX

cli/src/main/java/org/mcphackers/mcp/main/MainCLI.java

@@ -103,7 +103,7 @@ public MainCLI(String[] args) {
 					mode = TaskMode.EXIT;
 				} else {
 					str = str.trim();
-					if (str.length() == 0) {
+					if (str.isEmpty()) {
 						continue;
 					}
 					System.out.print(new Ansi().fgDefault());
@@ -323,6 +323,7 @@ public void showMessage(String title, String msg, int type) {
 		log("[" + typeName + "]: " + msg);
 	}
 
+	@SuppressWarnings("CallToPrintStackTrace")
 	@Override
 	public void showMessage(String title, String msg, Throwable e) {
 		Ansi typeName = new Ansi().fgRed().a("ERROR").fgDefault();

gui/src/main/java/org/mcphackers/mcp/gui/MCPFrame.java

@@ -50,7 +50,7 @@ public class MCPFrame extends JFrame implements WindowListener {
 	private final List<TaskButton> buttons = new ArrayList<>();
 	public MenuBar menuBar;
 	public boolean loadingVersions = true;
-	private JComboBox<?> verList;
+	private JComponent verList;
 	private JLabel verLabel;
 	//private JButton verCleanup;
 	private JPanel topRightContainer;
@@ -143,9 +143,13 @@ public void reloadVersionList() {
 				verLabel = new JLabel(MCP.TRANSLATOR.translateKey("mcp.versionList.failure"));
 				verLabel.setBorder(new EmptyBorder(4, 0, 0, 2));
 				verLabel.setForeground(Color.RED);
-				verList = null;
+				JButton verList = new JButton(MCP.TRANSLATOR.translateKey("mcp.versionList.reloadVersionList"));
+				verList.addActionListener(e -> {
+					reloadVersionList();
+				});
+				this.verList = verList;
 			} else {
-				verList = new JComboBox<>(versionParser.getVersions().toArray());
+				JComboBox<?> verList = new JComboBox<>(versionParser.getVersions().toArray());
 				verList.addPopupMenuListener(new PopupMenuListener() {
 
 					@Override
@@ -165,6 +169,7 @@ public void popupMenuCanceled(PopupMenuEvent e) {
 				setCurrentVersion(mcp.currentVersion == null ? null : versionParser.getVersion(mcp.currentVersion.id));
 				verList.setMaximumRowCount(20);
 				verLabel = new JLabel(MCP.TRANSLATOR.translateKey("mcp.versionList.currentVersion"));
+				this.verList = verList;
 			}
 			topRightContainer.removeAll();
 			topRightContainer.add(this.verLabel);
@@ -226,8 +231,11 @@ public void setCurrentVersion(VersionData versionData) {
 		if (verList == null) {
 			return;
 		}
-		verList.setSelectedItem(versionData);
-		verList.repaint();
+		if (this.verList instanceof JComboBox) {
+			JComboBox<?> verList = (JComboBox<?>) this.verList;
+			verList.setSelectedItem(versionData);
+			verList.repaint();
+		}
 	}
 
 	/**

src/main/resources/lang/en_US.lang

@@ -14,6 +14,7 @@ mcp.incompatiblePlugin = Incompatible plugin found:
 mcp.versionList.currentVersion = Current version:
 mcp.versionList.failure = Unable to get version list!
 mcp.versionList.loading = Loading...
+mcp.versionList.reloadVersionList = Reload version list
 mcp.checkUpdate = Check for updates
 mcp.upToDate = Up to date!
 mcp.viewDir = View working directory