diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:44:11 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:44:11 +0800 |
| commit | 695863367fb42d6435a36aea9290cb9eb1638ced (patch) | |
| tree | a4f6b94be3632d880245c064dbf99ead5a64f83e /src/main/java/net/fabricmc/loom/util/srg | |
| parent | cea80b01195be2ab6bd5cdadbcf7fa7b2972e131 (diff) | |
| download | architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.tar.gz architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.tar.bz2 architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/util/srg')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java b/src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java index f45f149d..8d5e7738 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java +++ b/src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java @@ -50,8 +50,8 @@ public class SpecialSourceExecutor { .filter(s -> !s.startsWith("\t")) .map(s -> s.split(" ")[0] + ".class") .collect(Collectors.toSet()); - LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); - Path stripped = extension.getProjectBuildCache().toPath().resolve(officialJar.getFileName().toString().substring(0, officialJar.getFileName().toString().length() - 4) + "-filtered.jar"); + LoomGradleExtension extension = LoomGradleExtension.get(project.getProject()); + Path stripped = extension.getFiles().getProjectBuildCache().toPath().resolve(officialJar.getFileName().toString().substring(0, officialJar.getFileName().toString().length() - 4) + "-filtered.jar"); Files.deleteIfExists(stripped); try (JarOutputStream output = new JarOutputStream(Files.newOutputStream(stripped))) { @@ -64,7 +64,7 @@ public class SpecialSourceExecutor { }); } - Path output = extension.getProjectBuildCache().toPath().resolve(officialJar.getFileName().toString().substring(0, officialJar.getFileName().toString().length() - 4) + "-srg-output.jar"); + Path output = extension.getFiles().getProjectBuildCache().toPath().resolve(officialJar.getFileName().toString().substring(0, officialJar.getFileName().toString().length() - 4) + "-srg-output.jar"); Files.deleteIfExists(output); String[] args = new String[] { |