Skip to content

Commit f357cfa

Browse files
committed
Skip access transformers that don't exist
1 parent 43a8395 commit f357cfa

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package net.minecraftforge.mcmaven.cli;
66

77
import java.io.File;
8+
import java.util.ArrayList;
89
import java.util.HashMap;
910
import java.util.Map;
1011

@@ -199,7 +200,7 @@ static OptionParser run(String[] args, boolean getParser) throws Exception {
199200
options.has(globalAuxiliaryVariantsO),
200201
options.has(disableGradleO),
201202
options.has(stubO),
202-
options.valuesOf(accessTransformerO),
203+
new ArrayList<>(options.valuesOf(accessTransformerO)),
203204
options.valueOf(outputJsonO)
204205
);
205206
mcmaven.run(artifact);

src/main/java/net/minecraftforge/mcmaven/impl/MinecraftMaven.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,22 @@ public MinecraftMaven(File output, boolean dependenciesOnly, File cacheRoot, Fil
100100
LOGGER.info(" Disable Gradle: " + disableGradle);
101101
LOGGER.info(" Stub Jars: " + stubJars);
102102
if (!accessTransformer.isEmpty()) {
103-
LOGGER.getInfo().print(" Access Transformer: ");
103+
var first = true;
104104
var itor = accessTransformer.iterator();
105105
while (itor.hasNext()) {
106106
var file = itor.next();
107+
if (first) {
108+
LOGGER.getInfo().print(" Access Transformer: ");
109+
first = false;
110+
} else {
111+
LOGGER.getInfo().print(" ");
112+
}
107113
LOGGER.getInfo().print(file.getAbsolutePath());
108-
if (itor.hasNext())
109-
LOGGER.getInfo().print(", ");
114+
if (!file.exists()) {
115+
LOGGER.getInfo().print(" SKIPPING DOESN'T EXIST");
116+
itor.remove();
117+
}
118+
LOGGER.getInfo().println();
110119
}
111120
LOGGER.getInfo().println();
112121
}
@@ -449,6 +458,8 @@ private void writeAccessTransformed(File target, File source, Artifact artifact)
449458
"--outJar", target.getAbsolutePath()
450459
));
451460
for (var file : accessTransformer) {
461+
if (!file.exists())
462+
throw new IllegalStateException("Access Transformer config does not exist: " + file.getAbsolutePath());
452463
args.add("--atfile");
453464
args.add(file.getAbsolutePath());
454465
}

0 commit comments

Comments
 (0)