Skip to content

fix: extract Classic server zip after download completes #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bouclem wants to merge 2 commits into from
+22 −13
Closed

fix: extract Classic server zip after download completes #239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdd04c6
fix: extract Classic server zip after download completes
bouclem May 25, 2026
9b860b4
refactor: extract server zip via private instance method
bouclem May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions src/main/java/org/mcphackers/mcp/tools/versions/DownloadData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,12 @@ public DownloadData(MCP mcp, Path libraries, Path gameDir, Path client, Path ser
Artifact serverArtifact = version.downloads.artifacts.get("server");
if (mcp.getOptions().getSide().includesServer() && serverArtifact != null) {
Path serverOut = server;
Path serverExtractTo = null;
if (serverArtifact.url.endsWith(".zip")) {
serverOut = server.getParent().resolve("minecraft_server.zip");
serverExtractTo = server;
}
queueDownload(serverArtifact, serverOut);
if (serverArtifact.url.endsWith(".zip")) {
try {
FileUtil.extractByExtension(serverOut, serverOut.getParent(), ".jar");
if (Files.exists(serverOut.getParent().resolve("minecraft-server.jar"))) {
Files.move(serverOut.getParent().resolve("minecraft-server.jar"), server);
}
} catch (IOException e) {
e.printStackTrace();
}
}
queueDownload(serverArtifact, serverOut, serverExtractTo);
}
for (DependDownload dependencyDownload : version.libraries) {
if (Rule.apply(dependencyDownload.rules)) {
Expand Down Expand Up @@ -132,11 +124,15 @@ public void setAssets(AssetIndex assets) {
}

public void queueDownload(IDownload dl, Path baseDir) {
queueDownload(dl, baseDir, null);
}

private void queueDownload(IDownload dl, Path baseDir, Path extractTo) {
if (dl == null) {
return;
}
totalSize += dl.downloadSize();
downloadQueue.add(new Download(dl, baseDir));
downloadQueue.add(new Download(dl, baseDir, extractTo));
}

public void performDownload(DownloadListener listener) throws IOException {
Expand All @@ -152,16 +148,29 @@ public void performDownload(DownloadListener listener) throws IOException {
if (parent != null) Files.createDirectories(parent);
FileUtil.downloadFile(download.downloadURL(), file);
}
if (dl.extractTo != null) {
extractServerZip(file, dl.extractTo);
}
}
}

private void extractServerZip(Path serverZip, Path serverJar) throws IOException {
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 {
IDownload download;
Path dir;
Path extractTo;

public Download(IDownload dl, Path path) {
public Download(IDownload dl, Path path, Path extractTo) {
download = dl;
dir = path;
this.extractTo = extractTo;
}
}
}