Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Vineflower the default decompiler #1110

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Make Vineflower the default decompiler #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/runtime.libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions gradle/test.libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/fabricmc/loom/configuration/decompile/DecompileConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
});
}
}
2 changes: 1 addition & 1 deletion src/main/java/net/fabricmc/loom/configuration/decompile/SplitDecompileConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
});
}
}