Compile to J11

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-09-11 04:19:51 +08:00
parent e1f5f3d6eb
commit 3bc5ab25c0
4 changed files with 25 additions and 8 deletions

View File

@@ -488,7 +488,7 @@ public class MinecraftPatchedProvider extends DependencyProvider {
try (FileSystem fs = FileSystems.newFileSystem(new URI("jar:" + jarFile.toURI()), ImmutableMap.of("create", false))) {
ThreadingUtils.TaskCompleter completer = ThreadingUtils.taskCompleter();
Pattern vignetteParameters = Pattern.compile("p_\\d+_");
Pattern vignetteParameters = Pattern.compile("p_[0-9a-zA-Z]+_(?:[0-9a-zA-Z]+_)?");
for (Path file : (Iterable<? extends Path>) Files.walk(fs.getPath("/"))::iterator) {
if (!file.toString().endsWith(".class")) continue;
@@ -697,11 +697,10 @@ public class MinecraftPatchedProvider extends DependencyProvider {
ThreadingUtils.run(Environment.values(), environment -> {
copyMissingClasses(environment.srgJar.apply(this), environment.patchedSrgJar.apply(this));
deleteParameterNames(environment.patchedSrgJar.apply(this));
if (getExtension().isForgeAndNotOfficial()) {
fixParameterAnnotation(environment.patchedSrgJar.apply(this));
} else {
deleteParameterNames(environment.patchedSrgJar.apply(this));
}
});