Skip to content

Commit 23f7db5

Browse files
committed
Publish metadata artifact for non-mcp net.minecraft artifacts
1 parent 1b5adfc commit 23f7db5

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

src/main/java/net/minecraftforge/mcmaven/impl/repo/mcpconfig/MCPConfigRepo.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public List<PendingArtifact> process(Artifact artifact, Mappings mappings, Map<S
158158
var name = Artifact.from("net.minecraft", side, version);
159159

160160
var pom = pending("Maven POM", pom(build, side, mcpSide, version), name.withExtension("pom"), false);
161-
var metadata = pending("Metadata", metadata(build, mcpSide), name.withClassifier("metadata").withExtension("zip"), false, metadataVariant());
161+
var metadata = pending("Metadata", metadata(build, mcpSide.getName(), mcpSide.getMCP().getMinecraftTasks()), name.withClassifier("metadata").withExtension("zip"), false, metadataVariant());
162162

163163
if (dependenciesOnly) {
164164
return List.of(
@@ -204,22 +204,26 @@ public List<PendingArtifact> processWithoutMcp(Artifact artifact, Mappings mappi
204204

205205
var tasks = this.getMCTasks(artifact.getVersion());
206206
var cache = new File(this.cache.root(), "without_mcp");
207+
var build = new File(cache, artifact.getVersion() + File.separator + artifact.getName());
207208

208209
if (outputJson != null) {
209210
outputJson.put("mappings.channel", mappings::channel);
210211
outputJson.put("mappings.version", mappings::version);
211212
}
212213

214+
// This only contains the version json, but might as well share it
215+
var metadata = pending("Metadata", metadata(build, artifact.getName(), tasks), artifact.withClassifier("metadata").withExtension("zip"), false, metadataVariant());
216+
213217
// For non-obfuscated versions, basically all we do is create the pom and extract the server if needed
214218
if (!isObfuscated(artifact.getVersion())) {
215219
if ("client".equals(artifact.getName())) {
216220
var pom = pending("Maven POM", tasks.clientPom(), artifact.withExtension("pom"), false);
217221
var jar = pending("Official Jar", tasks.versionFile(MCFile.CLIENT_JAR), artifact, false);
218-
return List.of(pom, jar);
222+
return List.of(metadata, pom, jar);
219223
} else if ("server".equals(artifact.getName())) {
220224
var pom = pending("Maven POM", tasks.serverPom(), artifact.withExtension("pom"), false);
221225
var jar = pending("Official Jar", tasks.extractServer(), artifact, false);
222-
return List.of(pom, jar);
226+
return List.of(metadata, pom, jar);
223227
}
224228
throw new IllegalArgumentException("MCPConfigRepo does not support artifact: " + artifact);
225229
}
@@ -235,15 +239,15 @@ public List<PendingArtifact> processWithoutMcp(Artifact artifact, Mappings mappi
235239
}
236240

237241
if ("mappings".equals(artifact.getName())) {
238-
return List.of(mapPom, m2o);
242+
return List.of(metadata, mapPom, m2o);
239243
} else if ("client".equals(artifact.getName())) {
240244
var pom = pending("Maven POM", tasks.clientPom(), artifact.withExtension("pom"), false);
241245
var jar = pending("Official Jar", tasks.renameClient(), artifact, false);
242-
return List.of(mapPom, m2o, pom, jar);
246+
return List.of(metadata, mapPom, m2o, pom, jar);
243247
} else if ("server".equals(artifact.getName())) {
244248
var pom = pending("Maven POM", tasks.serverPom(), artifact.withExtension("pom"), false);
245249
var jar = pending("Official Jar", tasks.renameServer(), artifact, false);
246-
return List.of(mapPom, m2o, pom, jar);
250+
return List.of(metadata, mapPom, m2o, pom, jar);
247251
} else {
248252
throw new IllegalArgumentException("MCPConfigRepo does not support artifact: " + artifact);
249253
}
@@ -292,8 +296,7 @@ private static Task mergeExtra(File build, String side, Task recompiled, Task ex
292296
});
293297
}
294298

295-
private static Task metadata(File build, MCPSide side) {
296-
var minecraftTasks = side.getMCP().getMinecraftTasks();
299+
private static Task metadata(File build, String side, MinecraftTasks minecraftTasks) {
297300
return Task.named("metadata[" + side + ']', Task.deps(minecraftTasks.versionJson), () -> {
298301
var output = new File(build, "metadata.zip");
299302

0 commit comments

Comments
 (0)