refactor: extract server zip via static helper in caller

Author: bouclem

src/main/java/org/mcphackers/mcp/tasks/TaskSetup.java

@@ -87,6 +87,9 @@ protected Stage[] setStages() {
 					for (Path nativeArchive : DownloadData.getNatives(MCPPaths.get(mcp, LIB), versionJson)) {
 						FileUtil.extract(nativeArchive, natives);
 					}
+					if (mcp.getOptions().getSide().includesServer()) {
+						DownloadData.extractServerZip(versionJson, MCPPaths.get(mcp, JAR_ORIGINAL, Side.SERVER));
+					}
 					try (BufferedWriter writer = Files.newBufferedWriter(MCPPaths.get(mcp, VERSION))) {
 						versionJsonObj.write(writer, 1, 0);
 					}

src/main/java/org/mcphackers/mcp/tools/versions/DownloadData.java

@@ -28,8 +28,6 @@ public class DownloadData {
 	public int totalSize;
 	protected List<Download> downloadQueue = new ArrayList<>();
 	protected AssetIndex assets;
-	private Path serverZip;
-	private Path serverJar;
 
 	public DownloadData(MCP mcp, Version version) {
 		this(mcp, MCPPaths.get(mcp, MCPPaths.LIB), MCPPaths.get(mcp, MCPPaths.JARS), MCPPaths.get(mcp, MCPPaths.JAR_ORIGINAL, Side.CLIENT), MCPPaths.get(mcp, MCPPaths.JAR_ORIGINAL, Side.SERVER), version);
@@ -45,8 +43,6 @@ public DownloadData(MCP mcp, Path libraries, Path gameDir, Path client, Path ser
 			Path serverOut = server;
 			if (serverArtifact.url.endsWith(".zip")) {
 				serverOut = server.getParent().resolve("minecraft_server.zip");
-				this.serverZip = serverOut;
-				this.serverJar = server;
 			}
 			queueDownload(serverArtifact, serverOut);
 		}
@@ -114,6 +110,19 @@ public static List<Path> getNatives(Path libDir, Version version) {
 		return retList;
 	}
 
+	public static void extractServerZip(Version version, Path serverJar) throws IOException {
+		Artifact serverArtifact = version.downloads.artifacts.get("server");
+		if (serverArtifact == null || !serverArtifact.url.endsWith(".zip")) {
+			return;
+		}
+		Path serverZip = serverJar.getParent().resolve("minecraft_server.zip");
+		FileUtil.extractByExtension(serverZip, serverZip.getParent(), ".jar");
+		Path extracted = serverZip.getParent().resolve("minecraft-server.jar");
+		if (Files.exists(extracted)) {
+			Files.move(extracted, serverJar);
+		}
+	}
+
 	public void setAssets(AssetIndex assets) {
 		if (this.assets != null) {
 			return;
@@ -147,18 +156,6 @@ public void performDownload(DownloadListener listener) throws IOException {
 				FileUtil.downloadFile(download.downloadURL(), file);
 			}
 		}
-		extractServerZip();
-	}
-
-	private void extractServerZip() throws IOException {
-		if (serverZip == null || !Files.exists(serverZip)) {
-			return;
-		}
-		FileUtil.extractByExtension(serverZip, serverZip.getParent(), ".jar");
-		Path extracted = serverZip.getParent().resolve("minecraft-server.jar");
-		if (Files.exists(extracted)) {
-			Files.move(extracted, serverJar);
-		}
 	}
 
 	private static class Download {