Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-07-20 23:44:11 +08:00
parent cea80b0119
commit 695863367f
25 changed files with 364 additions and 45 deletions

View File

@@ -61,7 +61,7 @@ public class SourceRemapper {
}
public static String intermediary(Project project) {
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
LoomGradleExtension extension = LoomGradleExtension.get(project);;
return extension.isForge() ? "srg" : "intermediary";
}