From f277d47e7789bd3f962efbf8c4b6ccd2ca239ec5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 4 Dec 2021 03:44:18 +0800 Subject: [PATCH] Fix checkstyle and resolve reviews Signed-off-by: shedaniel --- src/main/java/net/fabricmc/loom/LoomGradleExtension.java | 2 -- .../configuration/providers/MinecraftProviderImpl.java | 2 +- .../configuration/providers/forge/McpConfigProvider.java | 8 ++++---- .../providers/forge/MinecraftPatchedProvider.java | 1 - .../loom/extension/LoomGradleExtensionApiImpl.java | 2 +- .../fabricmc/loom/extension/LoomGradleExtensionImpl.java | 2 +- .../ArchitecturyGenerateSourcesTask.java | 6 ++---- .../java/net/fabricmc/loom/task/GenerateSourcesTask.java | 6 +++--- src/main/java/net/fabricmc/loom/task/LoomTasks.java | 1 - .../net/fabricmc/loom/util/srg/SpecialSourceExecutor.java | 1 - 10 files changed, 12 insertions(+), 19 deletions(-) rename src/main/java/net/fabricmc/loom/task/{architectury => }/ArchitecturyGenerateSourcesTask.java (93%) diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index e7e2c039..85855067 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -119,8 +119,6 @@ public interface LoomGradleExtension extends LoomGradleExtensionAPI { // =================== // Architectury Loom // =================== - Project getProject(); - default PatchProvider getPatchProvider() { return getDependencyManager().getProvider(PatchProvider.class); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java index c8987bfe..c0ef6acd 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java @@ -350,7 +350,7 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra if (isNewerThan21w39a != null) { return isNewerThan21w39a; } - + return isNewerThan21w39a = ZipUtils.contains(minecraftServerJar.toPath(), "META-INF/versions.list"); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java index e357a15d..7404cc0a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/McpConfigProvider.java @@ -207,10 +207,10 @@ public class McpConfigProvider extends DependencyProvider { List args = this.args.stream() .map(str -> { return switch (str) { - case "{input}" -> input.toAbsolutePath().toString(); - case "{output}" -> output.toAbsolutePath().toString(); - case "{mappings}" -> mappings.toAbsolutePath().toString(); - default -> str; + case "{input}" -> input.toAbsolutePath().toString(); + case "{output}" -> output.toAbsolutePath().toString(); + case "{mappings}" -> mappings.toAbsolutePath().toString(); + default -> str; }; }) .collect(Collectors.toList()); 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 a74b49d0..fadf7d33 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 @@ -87,7 +87,6 @@ import org.objectweb.asm.tree.ClassNode; import net.fabricmc.loom.configuration.DependencyProvider; import net.fabricmc.loom.configuration.providers.MinecraftProviderImpl; -import net.fabricmc.loom.extension.LoomGradleExtensionImpl; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.FileSystemUtil; diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java index e8af2304..d3f6d671 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java @@ -87,7 +87,7 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA // =================== // Architectury Loom // =================== - protected final ListProperty archDecompilers; + private final ListProperty archDecompilers; private Provider platform; private boolean silentMojangMappingsLicense = false; public Boolean generateSrgTiny = null; diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java index a1861c91..9b93c066 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java @@ -87,7 +87,7 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen } @Override - public Project getProject() { + protected Project getProject() { return project; } diff --git a/src/main/java/net/fabricmc/loom/task/architectury/ArchitecturyGenerateSourcesTask.java b/src/main/java/net/fabricmc/loom/task/ArchitecturyGenerateSourcesTask.java similarity index 93% rename from src/main/java/net/fabricmc/loom/task/architectury/ArchitecturyGenerateSourcesTask.java rename to src/main/java/net/fabricmc/loom/task/ArchitecturyGenerateSourcesTask.java index bfab7ff8..a1c65b32 100644 --- a/src/main/java/net/fabricmc/loom/task/architectury/ArchitecturyGenerateSourcesTask.java +++ b/src/main/java/net/fabricmc/loom/task/ArchitecturyGenerateSourcesTask.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.task.architectury; +package net.fabricmc.loom.task; import java.io.IOException; @@ -35,8 +35,6 @@ import org.gradle.api.tasks.InputFile; import org.gradle.api.tasks.TaskAction; import net.fabricmc.loom.api.decompilers.architectury.ArchitecturyLoomDecompiler; -import net.fabricmc.loom.task.AbstractLoomTask; -import net.fabricmc.loom.task.GenerateSourcesTask; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.OperatingSystem; @@ -72,7 +70,7 @@ public abstract class ArchitecturyGenerateSourcesTask extends AbstractLoomTask { params.getSourcesDestinationJar().set(GenerateSourcesTask.getMappedJarFileWithSuffix(getProject(), "-sources.jar")); params.getLinemap().set(GenerateSourcesTask.getMappedJarFileWithSuffix(getProject(), "-sources.lmap")); params.getLinemapJar().set(GenerateSourcesTask.getMappedJarFileWithSuffix(getProject(), "-linemapped.jar")); - params.getMappings().set(GenerateSourcesTask.getMappings(getExtension()).toFile()); + params.getMappings().set(GenerateSourcesTask.getMappings(getProject(), getExtension()).toFile()); params.getClassPath().setFrom(getProject().getConfigurations().getByName(Constants.Configurations.MINECRAFT_DEPENDENCIES)); diff --git a/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java b/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java index 28e7fa6d..67ea201f 100644 --- a/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java @@ -147,7 +147,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask { params.getSourcesDestinationJar().set(getMappedJarFileWithSuffix("-sources.jar")); params.getLinemap().set(getMappedJarFileWithSuffix("-sources.lmap")); params.getLinemapJar().set(getMappedJarFileWithSuffix("-linemapped.jar")); - params.getMappings().set(getMappings(getExtension()).toFile()); + params.getMappings().set(getMappings(getProject(), getExtension()).toFile()); if (ipcPath != null) { params.getIPCPath().set(ipcPath.toFile()); @@ -308,7 +308,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask { return new File(path.substring(0, path.length() - 4) + suffix); } - public static Path getMappings(LoomGradleExtension extension) { + static Path getMappings(Project project, LoomGradleExtension extension) { Path baseMappings = extension.isForge() ? extension.getMappingsProvider().tinyMappingsWithSrg : extension.getMappingsProvider().tinyMappings; if (extension.getEnableTransitiveAccessWideners().get()) { @@ -326,7 +326,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask { throw new RuntimeException("Failed to create temp file", e); } - TransitiveAccessWidenerMappingsProcessor.process(baseMappings, outputMappings, accessWideners, extension.getProject().getLogger()); + TransitiveAccessWidenerMappingsProcessor.process(baseMappings, outputMappings, accessWideners, project.getLogger()); return outputMappings; } diff --git a/src/main/java/net/fabricmc/loom/task/LoomTasks.java b/src/main/java/net/fabricmc/loom/task/LoomTasks.java index 5dc73460..47ea0eb6 100644 --- a/src/main/java/net/fabricmc/loom/task/LoomTasks.java +++ b/src/main/java/net/fabricmc/loom/task/LoomTasks.java @@ -38,7 +38,6 @@ import net.fabricmc.loom.api.decompilers.architectury.ArchitecturyLoomDecompiler import net.fabricmc.loom.configuration.ide.RunConfigSettings; import net.fabricmc.loom.configuration.ide.SetupIntelijRunConfigs; import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; -import net.fabricmc.loom.task.architectury.ArchitecturyGenerateSourcesTask; import net.fabricmc.loom.util.Constants; public final class LoomTasks { 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 64ccd6c8..59392e94 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java +++ b/src/main/java/net/fabricmc/loom/util/srg/SpecialSourceExecutor.java @@ -37,7 +37,6 @@ import java.util.stream.Collectors; import com.google.common.base.Stopwatch; import org.apache.commons.io.output.NullOutputStream; import org.gradle.api.Project; -import org.gradle.api.file.FileCollection; import org.gradle.api.logging.LogLevel; import org.gradle.api.logging.configuration.ShowStacktrace;