Skip to content

Commit 6e4cdea

Browse files
committed
Do not download client/server when side is set
1 parent 0c9eba9 commit 6e4cdea

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

src/main/java/org/mcphackers/mcp/Options.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,8 @@ public Map<String, Object> getFernflowerOptions() {
222222
}
223223
return new HashMap<>(ffOptions);
224224
}
225+
226+
public Side getSide() {
227+
return this.side;
228+
}
225229
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,13 @@ public enum Side {
115115
public String getName() {
116116
return MCP.TRANSLATOR.translateKey("side." + name);
117117
}
118+
119+
public boolean includesClient() {
120+
return this.equals(ANY) || this.equals(MERGED) || this.equals(CLIENT);
121+
}
122+
123+
public boolean includesServer() {
124+
return this.equals(ANY) || this.equals(MERGED) || this.equals(SERVER);
125+
}
118126
}
119127
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ public class DownloadData {
3030
protected AssetIndex assets;
3131

3232
public DownloadData(MCP mcp, Version version) {
33-
this(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);
33+
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);
3434
}
3535

36-
public DownloadData(Path libraries, Path gameDir, Path client, Path server, Version version) {
36+
public DownloadData(MCP mcp, Path libraries, Path gameDir, Path client, Path server, Version version) {
3737
this.gameDir = gameDir;
38-
queueDownload(version.downloads.artifacts.get("client"), client);
38+
if (mcp.getOptions().getSide().includesClient()) {
39+
queueDownload(version.downloads.artifacts.get("client"), client);
40+
}
3941
Artifact serverArtifact = version.downloads.artifacts.get("server");
40-
if(serverArtifact != null) {
42+
if(mcp.getOptions().getSide().includesServer() && serverArtifact != null) {
4143
Path serverOut = server;
4244
if(serverArtifact.url.endsWith(".zip")) {
4345
serverOut = server.getParent().resolve("minecraft_server.zip");

0 commit comments

Comments
 (0)