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

Disable use of method parameter metadata until fixed in Vineflower 1.10.1 arrives for parameters with null names. #5

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Disable use of method parameter metadata until fixed in Vineflower 1.10.1 arrives for parameters with null names. #5

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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
shade 'net.neoforged:srgutils:1.0.1'
shade 'org.vineflower:vineflower:1.10.0'
shade 'net.neoforged.installertools:installertools:2.1.2'
shade 'net.neoforged:AutoRenamingTool:2.0.0'
shade 'net.neoforged:AutoRenamingTool:2.0.1'
shade 'net.neoforged:mergetool:2.0.5'

shade 'org.bouncycastle:bcpkix-jdk15on:1.58'
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated_resources/dependency_hashes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ com.google.code.gson:gson=b3add478d4382b78ea20b1671390a858002feb6c # 2.10.1
net.neoforged:srgutils=06b0bae582bfe3a7b2bd9a1163c878bfb80b5463 # 1.0.1
org.vineflower:vineflower=b796c5294acc0a4adf7e28ad6eef55e680123881 # 1.10.0
net.neoforged.installertools:installertools=72524c0362f812d8aa4cdb4c03e9b45e2b71ae3b # 2.1.2
net.neoforged:AutoRenamingTool=2eb671208b76ebca796c0275c1c06775c8848053 # 2.0.0
net.neoforged:AutoRenamingTool=e7a43a02eb3e508d4de45e9761689bbd2926b509 # 2.0.1
net.neoforged:mergetool=d892e1148009e2d63f59b92c77d1fc619f01189c # 2.0.5
org.bouncycastle:bcpkix-jdk15on=15a760a039b040e767a75c77ffcc4ff62558f903 # 1.58
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml=9363ded5441b1fee62d5be0604035690ca759a2a # 2.13.3
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/neoforged/snowblower/Generator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public class Generator implements AutoCloseable {
private boolean removeRemote;
private boolean freshIfRequired;
private boolean partialCache;
private final String[] decompileArgs = new String[]{"-din=1", "-rbr=1", "-dgs=1", "-asc=1", "-rsy=1", "-iec=1", "-jvn=1", "-jpr=1", "-isl=0", "-iib=1", "-bsm=1", "-dcl=1", "-ind= "};
private final String[] decompileArgs = new String[]{"-din=1", "-rbr=1", "-dgs=1", "-asc=1", "-rsy=1", "-iec=1", "-jvn=1", "-jpr=1", "-isl=0", "-iib=1", "-bsm=1", "-dcl=1", "-ind= ", "-ump=0"};

public Generator(Path output, Path cache, Path extraMappings, DependencyHashCache depCache, List<String> includes, List<String> excludes) {
this.output = output.toAbsolutePath().normalize();
Expand Down Expand Up @@ -659,6 +659,7 @@ private Path getRenamedJar(Path cache, Path joined, Path mappings, Path libCache
.add(Transformer.sourceFixerFactory(SourceFixerConfig.JAVA))
.add(Transformer.recordFixerFactory())
.add(Transformer.signatureStripperFactory(SignatureStripperConfig.ALL))
.add(Transformer.parameterFinalFlagRemoverFactory())
.logger(s -> {});
libs.forEach(l -> builder.lib(l.toFile()));
try (final var renamer = builder.build()) {
Expand Down
Loading