Fix misc jar remapping issues.

This commit is contained in:
modmuss50
2022-01-16 17:01:56 +00:00
parent d40241d75a
commit 421b41ebc7
6 changed files with 14 additions and 26 deletions

View File

@@ -79,14 +79,12 @@ public abstract class PrepareJarRemapTask extends AbstractLoomTask {
workQueue.submit(ReadInputsAction.class, params -> {
params.getTinyRemapperBuildServiceUuid().set(UnsafeWorkQueueHelper.create(getProject(), remapJarTask.getTinyRemapperService()));
params.getInputTagName().set(remapJarTask.getInputTagName());
params.getInputFile().set(getInputFile());
});
}
public interface ReadInputsParams extends WorkParameters {
Property<String> getTinyRemapperBuildServiceUuid();
Property<String> getInputTagName();
RegularFileProperty getInputFile();
}
@@ -102,7 +100,7 @@ public abstract class PrepareJarRemapTask extends AbstractLoomTask {
final TinyRemapper tinyRemapper = tinyRemapperService.getTinyRemapperForInputs();
final Path inputFile = getParameters().getInputFile().getAsFile().get().toPath();
tinyRemapper.readInputsAsync(tinyRemapperService.createTag(getParameters().getInputTagName().get()), inputFile);
tinyRemapper.readInputsAsync(tinyRemapperService.getOrCreateTag(inputFile), inputFile);
}
}
}