Make Vineflower the default decompiler (#1110)

FabricMC · Apr 26, 2024 · 2752dc3 · 2752dc3
1 parent 2c3a0ad
commit 2752dc3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ guava = "33.0.0-jre"
 stitch = "0.6.2"
 tiny-remapper = "0.10.1"
 access-widener = "2.1.0"
-mapping-io = "0.5.1"
+mapping-io = "0.6.1"
 lorenz-tiny = "4.0.2"
 mercury = "0.4.1"
 kotlinx-metadata = "0.9.0"

diff --git a/gradle/runtime.libs.versions.toml b/gradle/runtime.libs.versions.toml
@@ -2,7 +2,7 @@
 # Decompilers
 fernflower = "2.0.0"
 cfr = "0.2.2"
-vineflower = "1.10.0"
+vineflower = "1.10.1"
 
 # Runtime depedencies
 mixin-compile-extensions = "0.6.0"

diff --git a/gradle/test.libs.versions.toml b/gradle/test.libs.versions.toml
@@ -6,8 +6,8 @@ mockito = "5.11.0"
 java-debug = "0.52.0"
 mixin = "0.12.5+mixin.0.8.5"
 
-gradle-nightly = "8.9-20240413002319+0000"
-fabric-loader = "0.15.9"
+gradle-nightly = "8.9-20240426001649+0000"
+fabric-loader = "0.15.10"
 fabric-installer = "1.0.1"
 
 [libraries]

diff --git a/src/main/java/net/fabricmc/loom/configuration/decompile/DecompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/decompile/DecompileConfiguration.java
@@ -37,6 +37,8 @@
 import net.fabricmc.loom.util.Constants;
 
 public abstract class DecompileConfiguration<T extends MappedMinecraftProvider> {
+	static final String DEFAULT_DECOMPILER = "Vineflower";
+
 	protected final Project project;
 	protected final T minecraftProvider;
 	protected final LoomGradleExtension extension;

diff --git a/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
@@ -75,7 +75,7 @@ public final void afterEvaluation() {
 			task.setDescription("Decompile minecraft using the default decompiler.");
 			task.setGroup(Constants.TaskGroup.FABRIC);
 
-			task.dependsOn(project.getTasks().named("genSourcesWithCfr"));
+			task.dependsOn(project.getTasks().named("genSourcesWith" + DecompileConfiguration.DEFAULT_DECOMPILER));
 		});
 	}
 }
diff --git a/src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java
@@ -114,7 +114,7 @@ private TaskProvider<Task> createDecompileTasks(String name, Action<GenerateSour
 			task.setDescription("Decompile minecraft (%s) using the default decompiler.".formatted(name));
 			task.setGroup(Constants.TaskGroup.FABRIC);
 
-			task.dependsOn(project.getTasks().named("gen%sSourcesWithCfr".formatted(name)));
+			task.dependsOn(project.getTasks().named("gen%sSourcesWith%s".formatted(name, DecompileConfiguration.DEFAULT_DECOMPILER)));
 		});
 	}
 }