Skip to content

Commit 96e5a7c

Browse files
authored
Force a re-run of VF after the OOM check was added (#90)
1 parent 7c9537d commit 96e5a7c

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/main/java/net/neoforged/neoform/runtime/actions/ExternalJavaToolAction.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void run(ProcessingEnvironment environment) throws IOException, Interrupt
114114
command.add(environment.getPathArgument(toolArtifact.path()));
115115

116116
// Program Arguments
117-
boolean isVineflower = toolArtifactId.groupId().equals("org.vineflower") && toolArtifactId.artifactId().equals("vineflower");
117+
boolean isVineflower = isVineflower();
118118
for (var arg : args) {
119119
// For specific tasks we "fixup" the neoform spec
120120
if (isVineflower) {
@@ -169,6 +169,10 @@ public void run(ProcessingEnvironment environment) throws IOException, Interrupt
169169
}
170170
}
171171

172+
private boolean isVineflower() {
173+
return toolArtifactId.groupId().equals("org.vineflower") && toolArtifactId.artifactId().equals("vineflower");
174+
}
175+
172176
private static String printableCommand(List<String> command) {
173177
return command.stream().map(arg -> {
174178
if (arg.contains("\"")) {
@@ -232,6 +236,10 @@ public void computeCacheKey(CacheKeyBuilder ck) {
232236
if (listLibraries != null) {
233237
listLibraries.computeCacheKey(ck);
234238
}
239+
if (isVineflower()) {
240+
// Force re-run in case a broken decomp was cached before the OOM check was added
241+
ck.add("oom check", "true");
242+
}
235243
}
236244

237245
public MavenCoordinate getToolArtifactId() {

0 commit comments

Comments
 (0)