Skip to content

Commit ffc6a51

Browse files
committed
Don't add mappings csv zip as dependency if we are not obfuscated.
1 parent 5808d0e commit ffc6a51

3 files changed

Lines changed: 30 additions & 8 deletions

File tree

src/main/java/net/minecraftforge/mcmaven/impl/repo/Repo.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,19 @@ protected List<PendingArtifact> mappingArtifacts(File cache, Mappings mappings,
289289
var coords = mappings.getArtifact(side);
290290
var csvs = pending("Mappings Zip", mappings.getCsvZip(side), coords, false);
291291
var pom = pending("Mappings POM", simplePom(cache, coords), coords.withExtension("pom"), false);
292+
293+
if (outputJson != null) {
294+
outputJson.put("mappings.csv.artifact", csvs.artifact()::toString);
295+
outputJson.put("mappings.csv.file", csvs.task().filePathSupplier());
296+
}
297+
292298
// Just create the zip and pom for unobfuscated versions.
293299
if (!MCPConfigRepo.isObfuscated(side.getMCP().getMinecraftTasks().getVersion()))
294300
return List.of(csvs, pom);
301+
295302
var m2o = pending("Mappings map2obf", mappings.getMapped2Obf(side), coords.withClassifier("map2obf").withExtension("tsrg.gz"), false);
296303
var m2s = pending("Mappings map2srg", mappings.getMapped2Srg(side), coords.withClassifier("map2srg").withExtension("tsrg.gz"), false);
297304
if (outputJson != null) {
298-
outputJson.put("mappings.csv.artifact", csvs.artifact()::toString);
299-
outputJson.put("mappings.csv.file", csvs.task().filePathSupplier());
300305
outputJson.put("mappings.obf.artifact", m2o.artifact()::toString);
301306
outputJson.put("mappings.obf.file", m2o.task().filePathSupplier());
302307
outputJson.put("mappings.srg.artifact", m2s.artifact()::toString);

src/main/java/net/minecraftforge/mcmaven/impl/repo/forge/ForgeRepo.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828

2929
import javax.xml.parsers.ParserConfigurationException;
3030
import javax.xml.transform.TransformerException;
31+
32+
import org.jetbrains.annotations.Nullable;
33+
3134
import java.io.File;
3235
import java.io.FileOutputStream;
3336
import java.io.FileWriter;
@@ -152,7 +155,9 @@ private List<PendingArtifact> processV3(String version, Mappings mappings, Map<S
152155
var classesTask = new InjectTask(build, this.cache, name, patcher, recompile, mappings);
153156

154157
var extraCoords = Artifact.from(Constants.MC_GROUP, Constants.MC_CLIENT + "-extra", patcher.getMCP().getName().getVersion());
155-
var mappingCoords = mappings.getArtifact(joined);
158+
159+
// If we are not obfuscated, don't add the csv zip as a extra artifact
160+
var mappingCoords = patcher.isObfuscated() ? mappings.getArtifact(joined) : null;
156161

157162
var mappingArtifacts = mappingArtifacts(build, mappings, joined, outputJson);
158163

@@ -270,15 +275,18 @@ private static Task metadata(File build, Patcher patcher) {
270275
});
271276
}
272277

273-
private static Task pom(File build, Patcher patcher, String version, Artifact clientExtra, Artifact mappings) {
278+
private static Task pom(File build, Patcher patcher, String version, @Nullable Artifact clientExtra, @Nullable Artifact mappings) {
274279
return Task.named("pom[forge]", () -> {
275280
var output = new File(build, "forge.pom");
276281
var cache = Util.cache(output)
277282
.addKnown("data", patcher.getDataHash())
278-
.addKnown("extra", Util.replace(clientExtra, Object::toString))
279-
.addKnown("mappings", Util.replace(mappings, Object::toString))
280-
.addKnown("code-version", "1")
281-
;
283+
.addKnown("code-version", "1");
284+
285+
if (clientExtra != null)
286+
cache.addKnown("extra", clientExtra.toString());
287+
288+
if (mappings != null)
289+
cache.addKnown("mappings", mappings.toString());
282290

283291
if (Mavenizer.checkCache(output, cache))
284292
return output;

src/main/java/net/minecraftforge/mcmaven/impl/repo/forge/Patcher.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import net.minecraftforge.mcmaven.impl.cache.Cache;
3232
import net.minecraftforge.mcmaven.impl.cache.MavenCache;
3333
import net.minecraftforge.mcmaven.impl.repo.mcpconfig.MCP;
34+
import net.minecraftforge.mcmaven.impl.repo.mcpconfig.MCPConfigRepo;
3435
import net.minecraftforge.mcmaven.impl.repo.mcpconfig.MCPSide;
3536
import net.minecraftforge.mcmaven.impl.util.Artifact;
3637
import net.minecraftforge.mcmaven.impl.util.Constants;
@@ -197,6 +198,14 @@ private void validateConfig() {
197198
throw except("Missing parent or mcp entry");
198199
}
199200

201+
/**
202+
* @return Weither or not this patcher is for an obfuscated Minecraft version.
203+
* AKA: 26.1+ For now this is based off Minecraft version, but in the future could be opt-in by a MCPConfig setting.
204+
*/
205+
public boolean isObfuscated() {
206+
return MCPConfigRepo.isObfuscated(getMCP().getMinecraftTasks().getVersion());
207+
}
208+
200209
/** @return The instance of MCP used to decompile the game */
201210
public MCP getMCP() {
202211
return this.mcp == null ? this.parent.getMCP() : this.mcp;

0 commit comments

Comments
 (0)