From 566158cbdf205b7727d19575a222432b477d72c1 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 10 Aug 2022 15:47:11 +0800 Subject: [PATCH] Fix merge conflicts with refreshDeps Signed-off-by: shedaniel --- .../fabricmc/loom/configuration/MavenPublication.java | 2 +- .../providers/forge/DependencyProvider.java | 5 ++--- .../providers/forge/FieldMigratedMappingsProvider.java | 5 ++--- .../providers/forge/ForgeUniversalProvider.java | 2 +- .../providers/forge/ForgeUserdevProvider.java | 2 +- .../providers/forge/MinecraftPatchedProvider.java | 3 +-- .../configuration/providers/forge/PatchProvider.java | 2 +- .../loom/configuration/providers/forge/SrgProvider.java | 9 ++++----- .../providers/forge/mcpconfig/McpConfigProvider.java | 4 ++-- .../providers/mappings/MappingsProviderImpl.java | 6 +++--- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 4 ++-- 11 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java b/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java index 2a850d6d..2245860b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java +++ b/src/main/java/net/fabricmc/loom/configuration/MavenPublication.java @@ -72,7 +72,7 @@ public final class MavenPublication { PublishingExtension mavenPublish = project.getExtensions().findByType(PublishingExtension.class); if (mavenPublish != null) { - p.getLogger().info("Processing maven publication for project [" + p.getName() + "] of " + configurationName); + project.getLogger().info("Processing maven publication for project [" + project.getName() + "] of " + configurationName); processEntry(project, scope, config, mavenPublish, reportedDeprecation); } }); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java index d6d4ff1e..ba34f1a6 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java @@ -31,7 +31,6 @@ import org.gradle.api.Project; import org.gradle.api.artifacts.Dependency; import net.fabricmc.loom.LoomGradleExtension; -import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.configuration.DependencyInfo; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider; import net.fabricmc.loom.extension.LoomFiles; @@ -77,7 +76,7 @@ public abstract class DependencyProvider { return getExtension().getMinecraftProvider(); } - public boolean isRefreshDeps() { - return LoomGradlePlugin.refreshDeps; + public boolean refreshDeps() { + return getExtension().refreshDeps(); } } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingsProvider.java index a3d59693..5eef5daa 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingsProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMigratedMappingsProvider.java @@ -53,7 +53,6 @@ import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Opcodes; import net.fabricmc.loom.LoomGradleExtension; -import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.providers.mappings.IntermediateMappingsService; import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; @@ -84,7 +83,7 @@ public class FieldMigratedMappingsProvider extends MappingsProviderImpl { migratedFieldsCache = patchProvider.getProjectCacheFolder().resolve("migrated-fields.json"); migratedFields.clear(); - if (LoomGradlePlugin.refreshDeps) { + if (minecraftProvider.refreshDeps()) { Files.deleteIfExists(migratedFieldsCache); } else if (Files.exists(migratedFieldsCache)) { try (BufferedReader reader = Files.newBufferedReader(migratedFieldsCache)) { @@ -113,7 +112,7 @@ public class FieldMigratedMappingsProvider extends MappingsProviderImpl { this.rawTinyMappingsWithSrg = tinyMappingsWithSrg; if (extension.shouldGenerateSrgTiny()) { - if (Files.notExists(rawTinyMappingsWithSrg) || isRefreshDeps()) { + if (Files.notExists(rawTinyMappingsWithSrg) || extension.refreshDeps()) { // Merge tiny mappings with srg SrgMerger.ExtraMappings extraMappings = SrgMerger.ExtraMappings.ofMojmapTsrg(getMojmapSrgFileIfPossible(project)); SrgMerger.mergeSrg(getRawSrgFile(project), rawTinyMappings, rawTinyMappingsWithSrg, extraMappings, true); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java index 3cf742a3..1ebe08a2 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java @@ -43,7 +43,7 @@ public class ForgeUniversalProvider extends DependencyProvider { public void provide(DependencyInfo dependency) throws Exception { forge = new File(getExtension().getForgeProvider().getGlobalCache(), "forge-universal.jar"); - if (!forge.exists() || isRefreshDeps()) { + if (!forge.exists() || refreshDeps()) { File dep = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve Forge")); FileUtils.copyFile(dep, forge); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java index 6b0888e5..0d4eeb62 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java @@ -60,7 +60,7 @@ public class ForgeUserdevProvider extends DependencyProvider { joinedPatches = getExtension().getForgeProvider().getGlobalCache().toPath().resolve("patches-joined.lzma"); Path configJson = getExtension().getForgeProvider().getGlobalCache().toPath().resolve("forge-config.json"); - if (!userdevJar.exists() || Files.notExists(configJson) || isRefreshDeps()) { + if (!userdevJar.exists() || Files.notExists(configJson) || refreshDeps()) { File resolved = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve Forge userdev")); Files.copy(resolved.toPath(), userdevJar.toPath(), StandardCopyOption.REPLACE_EXISTING); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java index 199d08da..fd7a9d33 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java @@ -72,7 +72,6 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; import net.fabricmc.loom.LoomGradleExtension; -import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.configuration.accesstransformer.AccessTransformerJarProcessor; import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigData; import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigStep; @@ -167,7 +166,7 @@ public class MinecraftPatchedProvider { } private void checkCache() throws IOException { - if (LoomGradlePlugin.refreshDeps || Stream.of(getGlobalCaches()).anyMatch(Files::notExists) + if (getExtension().refreshDeps() || Stream.of(getGlobalCaches()).anyMatch(Files::notExists) || !isPatchedJarUpToDate(minecraftPatchedJar)) { cleanAllCache(); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java index 5a918d12..a49a7da2 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java @@ -52,7 +52,7 @@ public class PatchProvider extends DependencyProvider { public void provide(DependencyInfo dependency) throws Exception { init(dependency.getDependency().getVersion()); - if (Files.notExists(clientPatches) || Files.notExists(serverPatches) || isRefreshDeps()) { + if (Files.notExists(clientPatches) || Files.notExists(serverPatches) || refreshDeps()) { getProject().getLogger().info(":extracting forge patches"); Path installerJar = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve Forge installer")).toPath(); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java index f895caed..e161fa52 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java @@ -50,7 +50,6 @@ import org.gradle.api.Project; import org.gradle.api.logging.LogLevel; import net.fabricmc.loom.LoomGradleExtension; -import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.DependencyInfo; import net.fabricmc.loom.configuration.providers.mappings.GradleMappingContext; @@ -82,7 +81,7 @@ public class SrgProvider extends DependencyProvider { public void provide(DependencyInfo dependency) throws Exception { init(dependency.getDependency().getVersion()); - if (!Files.exists(srg) || isRefreshDeps()) { + if (!Files.exists(srg) || refreshDeps()) { Path srgZip = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve srg")).toPath(); try (FileSystem fs = FileSystems.newFileSystem(new URI("jar:" + srgZip.toUri()), ImmutableMap.of("create", false))) { @@ -95,7 +94,7 @@ public class SrgProvider extends DependencyProvider { } if (isTsrgV2) { - if (!Files.exists(mergedMojangRaw) || !Files.exists(mergedMojang) || !Files.exists(mergedMojangTrimmed) || isRefreshDeps()) { + if (!Files.exists(mergedMojangRaw) || !Files.exists(mergedMojang) || !Files.exists(mergedMojangTrimmed) || refreshDeps()) { Stopwatch stopwatch = Stopwatch.createStarted(); getProject().getLogger().lifecycle(":merging mappings (InstallerTools, srg + mojmap)"); PrintStream out = System.out; @@ -222,7 +221,7 @@ public class SrgProvider extends DependencyProvider { Path mojmapTsrg = extension.getMinecraftProvider().dir("forge").toPath().resolve("mojmap.tsrg"); - if (Files.notExists(mojmapTsrg) || LoomGradlePlugin.refreshDeps) { + if (Files.notExists(mojmapTsrg) || extension.refreshDeps()) { try (BufferedWriter writer = Files.newBufferedWriter(mojmapTsrg, StandardCharsets.UTF_8, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { Tsrg2Utils.writeTsrg(visitor -> visitMojmap(visitor, project), MappingsNamespace.NAMED.toString(), false, writer); @@ -239,7 +238,7 @@ public class SrgProvider extends DependencyProvider { Path mojmapTsrg2 = extension.getMinecraftProvider().dir("forge").toPath().resolve("mojmap.tsrg2"); - if (Files.notExists(mojmapTsrg2) || LoomGradlePlugin.refreshDeps) { + if (Files.notExists(mojmapTsrg2) || extension.refreshDeps()) { try (BufferedWriter writer = Files.newBufferedWriter(mojmapTsrg2, StandardCharsets.UTF_8, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { MemoryMappingTree tree = new MemoryMappingTree(); visitMojmap(tree, project); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java index eade43c0..6926eed0 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java @@ -56,7 +56,7 @@ public class McpConfigProvider extends DependencyProvider { Path mcpZip = dependency.resolveFile().orElseThrow(() -> new RuntimeException("Could not resolve MCPConfig")).toPath(); - if (!Files.exists(mcp) || !Files.exists(configJson) || isRefreshDeps()) { + if (!Files.exists(mcp) || !Files.exists(configJson) || refreshDeps()) { Files.copy(mcpZip, mcp, StandardCopyOption.REPLACE_EXISTING); Files.write(configJson, ZipUtils.unpack(mcp, "config.json"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); } @@ -76,7 +76,7 @@ public class McpConfigProvider extends DependencyProvider { configJson = dir.resolve("mcp-config.json"); mappings = dir.resolve("mcp-config-mappings.txt"); - if (isRefreshDeps()) { + if (refreshDeps()) { Files.deleteIfExists(mappings); } } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java index 6ac1e996..2f959032 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java @@ -216,7 +216,7 @@ public class MappingsProviderImpl implements MappingsProvider, SharedService { manipulateMappings(project, tinyMappingsJar); if (extension.shouldGenerateSrgTiny()) { - if (Files.notExists(tinyMappingsWithSrg) || isRefreshDeps()) { + if (Files.notExists(tinyMappingsWithSrg) || extension.refreshDeps()) { // Merge tiny mappings with srg Stopwatch stopwatch = Stopwatch.createStarted(); SrgMerger.ExtraMappings extraMappings = SrgMerger.ExtraMappings.ofMojmapTsrg(getMojmapSrgFileIfPossible(project)); @@ -247,7 +247,7 @@ public class MappingsProviderImpl implements MappingsProvider, SharedService { throw new IllegalStateException("We have to generate srg tiny in a forge environment!"); } - if (Files.notExists(srgToNamedSrg) || isRefreshDeps()) { + if (Files.notExists(srgToNamedSrg) || extension.refreshDeps()) { SrgNamedWriter.writeTo(project.getLogger(), srgToNamedSrg, getMappingsWithSrg(), "srg", "named"); } } @@ -530,7 +530,7 @@ public class MappingsProviderImpl implements MappingsProvider, SharedService { Path path = mappingsWorkingDir.resolve("mappings-mixin-" + namespace + ".tiny"); try { - if (Files.notExists(path) || isRefreshDeps()) { + if (Files.notExists(path) || loom.refreshDeps()) { List lines = new ArrayList<>(Files.readAllLines(loom.shouldGenerateSrgTiny() ? tinyMappingsWithSrg : tinyMappings)); lines.set(0, lines.get(0).replace("intermediary", "yraidemretni").replace(namespace, "intermediary")); Files.deleteIfExists(path); diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index fb01da76..d8864b56 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -70,11 +70,11 @@ public class SourceRemapper { public static void remapSources(Project project, File input, File output, String from, String to, boolean reproducibleFileOrder, boolean preserveFileTimestamps) { SourceRemapper sourceRemapper = new SourceRemapper(project, from, to); - sourceRemapper.scheduleRemapSources(input, output, reproducibleFileOrder, preserveFileTimestamps); + sourceRemapper.scheduleRemapSources(input, output, reproducibleFileOrder, preserveFileTimestamps, () -> {}); sourceRemapper.remapAll(); } - public void scheduleRemapSources(File source, File destination, boolean reproducibleFileOrder, boolean preserveFileTimestamps) { + public void scheduleRemapSources(File source, File destination, boolean reproducibleFileOrder, boolean preserveFileTimestamps, Runnable completionCallback) { remapTasks.add((logger) -> { try { logger.progress("remapping sources - " + source.getName());