From dfa74148de36d36dfd6895ac09992b2a1818f032 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Tue, 31 Oct 2023 19:37:14 +0200 Subject: [PATCH] Code style and related fixes --- build.gradle | 7 ++-- .../architectury/loom/util/MappingOption.java | 3 +- .../configuration/CompileConfiguration.java | 3 +- .../forge/ForgeLibrariesProvider.java | 7 ++-- .../forge/MinecraftPatchedProvider.java | 4 +-- .../mappings/MappingConfiguration.java | 2 +- .../AbstractMappedMinecraftProvider.java | 4 +-- .../mapped/MojangMappedMinecraftProvider.java | 7 ++-- .../sources/ForgeSourcesRemapper.java | 4 +-- .../task/launch/GenerateDLIConfigTask.java | 3 +- .../net/fabricmc/loom/util/ModPlatform.java | 2 +- .../neoforge/SimpleNeoForgeTest.groovy | 32 +++++++++---------- 12 files changed, 34 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index a73752b7..5b518a14 100644 --- a/build.gradle +++ b/build.gradle @@ -254,8 +254,11 @@ spotless { target 'src/**/*.gradle', '*.gradle' greclipse() - // This file uses a @MAPPINGS@ token which is not valid Groovy - targetExclude('**/projects/forge/simple/build.gradle') + targetExclude( + // These files use a @MAPPINGS@ token which is not valid Groovy + '**/projects/forge/simple/build.gradle', + '**/projects/neoforge/simple/build.gradle' + ) } kotlin { diff --git a/src/main/java/dev/architectury/loom/util/MappingOption.java b/src/main/java/dev/architectury/loom/util/MappingOption.java index 23427231..4946634e 100644 --- a/src/main/java/dev/architectury/loom/util/MappingOption.java +++ b/src/main/java/dev/architectury/loom/util/MappingOption.java @@ -5,8 +5,7 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI; public enum MappingOption { DEFAULT, WITH_SRG, - WITH_MOJANG, - ; + WITH_MOJANG; public static MappingOption forPlatform(LoomGradleExtensionAPI extension) { return switch (extension.getPlatform().get()) { diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 2cc43631..9490fc14 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -35,8 +35,6 @@ import java.util.function.Consumer; import javax.inject.Inject; -import net.fabricmc.loom.configuration.providers.minecraft.mapped.MojangMappedMinecraftProvider; - import org.gradle.api.Project; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginExtension; @@ -74,6 +72,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets; import net.fabricmc.loom.configuration.providers.minecraft.mapped.AbstractMappedMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.mapped.IntermediaryMinecraftProvider; +import net.fabricmc.loom.configuration.providers.minecraft.mapped.MojangMappedMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.mapped.NamedMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.mapped.SrgMinecraftProvider; import net.fabricmc.loom.configuration.sources.ForgeSourcesRemapper; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java index d1c39ff9..b9f4de53 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java @@ -34,11 +34,6 @@ import java.util.List; import com.google.common.hash.Hashing; import com.google.gson.JsonElement; import dev.architectury.loom.neoforge.MojangMappingsMerger; - -import net.fabricmc.loom.api.mappings.layered.MappingContext; - -import net.fabricmc.loom.configuration.providers.mappings.GradleMappingContext; - import org.gradle.api.Project; import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.ModuleDependency; @@ -47,9 +42,11 @@ import org.gradle.api.artifacts.ResolvedArtifact; import org.gradle.api.artifacts.ResolvedConfiguration; import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.api.mappings.layered.MappingContext; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.mods.ModConfigurationRemapper; import net.fabricmc.loom.configuration.mods.dependency.LocalMavenHelper; +import net.fabricmc.loom.configuration.providers.mappings.GradleMappingContext; import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.ExceptionUtil; 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 62bb204d..1c2b5755 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 @@ -58,9 +58,6 @@ import dev.architectury.tinyremapper.InputTag; import dev.architectury.tinyremapper.NonClassCopyMode; import dev.architectury.tinyremapper.OutputConsumerPath; import dev.architectury.tinyremapper.TinyRemapper; - -import net.fabricmc.loom.build.IntermediaryNamespaces; - import org.gradle.api.Project; import org.gradle.api.logging.LogLevel; import org.gradle.api.logging.Logger; @@ -73,6 +70,7 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.configuration.accesstransformer.AccessTransformerJarProcessor; import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigProvider; import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpExecutor; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java index 8d3136c3..e3637ca3 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java @@ -165,7 +165,6 @@ public class MappingConfiguration { public TinyMappingsService getMappingsService(SharedServiceManager serviceManager, MappingOption mappingOption) { final Path tinyMappings = switch (mappingOption) { - default -> this.tinyMappings; case WITH_SRG -> { if (Files.notExists(this.tinyMappingsWithSrg)) { throw new UnsupportedOperationException("Cannot get mappings service with SRG mappings without SRG enabled!"); @@ -180,6 +179,7 @@ public class MappingConfiguration { yield this.tinyMappings; } + default -> this.tinyMappings; }; return TinyMappingsService.create(serviceManager, Objects.requireNonNull(tinyMappings)); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java index 29c333b5..74a4aef1 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java @@ -39,13 +39,11 @@ import java.util.function.Function; import dev.architectury.loom.util.MappingOption; import dev.architectury.tinyremapper.OutputConsumerPath; import dev.architectury.tinyremapper.TinyRemapper; - -import net.fabricmc.loom.build.IntermediaryNamespaces; - import org.gradle.api.Project; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; +import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.configuration.ConfigContext; import net.fabricmc.loom.configuration.mods.dependency.LocalMavenHelper; import net.fabricmc.loom.configuration.providers.mappings.IntermediaryMappingsProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java index 938090ef..8e9e3bd2 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java @@ -24,7 +24,10 @@ package net.fabricmc.loom.configuration.providers.minecraft.mapped; +import java.util.List; + import dev.architectury.tinyremapper.TinyRemapper; +import org.gradle.api.Project; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider; @@ -34,10 +37,6 @@ import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftPro import net.fabricmc.loom.configuration.providers.minecraft.SplitMinecraftProvider; import net.fabricmc.loom.util.SidedClassVisitor; -import org.gradle.api.Project; - -import java.util.List; - public abstract sealed class MojangMappedMinecraftProvider extends AbstractMappedMinecraftProvider permits MojangMappedMinecraftProvider.MergedImpl, MojangMappedMinecraftProvider.SingleJarImpl, MojangMappedMinecraftProvider.SplitImpl { public MojangMappedMinecraftProvider(Project project, M minecraftProvider) { super(project, minecraftProvider); diff --git a/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java b/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java index 7553b143..6ba0278b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java +++ b/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java @@ -41,9 +41,6 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; import dev.architectury.loom.util.MappingOption; - -import net.fabricmc.loom.build.IntermediaryNamespaces; - import org.apache.commons.io.output.NullOutputStream; import org.cadixdev.lorenz.MappingSet; import org.cadixdev.mercury.Mercury; @@ -52,6 +49,7 @@ import org.gradle.api.Project; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; +import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.configuration.providers.mappings.TinyMappingsService; import net.fabricmc.loom.task.GenerateSourcesTask; import net.fabricmc.loom.util.DeletingFileVisitor; diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java index 72ca4e6e..8056f7c4 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java @@ -36,12 +36,11 @@ import java.util.Set; import java.util.StringJoiner; import java.util.stream.Collectors; -import net.fabricmc.loom.build.IntermediaryNamespaces; - import org.apache.commons.io.FileUtils; import org.gradle.api.logging.configuration.ConsoleOutput; import org.gradle.api.tasks.TaskAction; +import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.configuration.providers.forge.ConfigValue; import net.fabricmc.loom.configuration.providers.forge.ForgeRunTemplate; import net.fabricmc.loom.configuration.providers.forge.ForgeRunsProvider; diff --git a/src/main/java/net/fabricmc/loom/util/ModPlatform.java b/src/main/java/net/fabricmc/loom/util/ModPlatform.java index b5e6588f..11641c03 100644 --- a/src/main/java/net/fabricmc/loom/util/ModPlatform.java +++ b/src/main/java/net/fabricmc/loom/util/ModPlatform.java @@ -46,7 +46,7 @@ public enum ModPlatform { } /** - * {@return the lowercase ID of this mod platform} + * Returns the lowercase ID of this mod platform. */ public String id() { return name().toLowerCase(Locale.ROOT); diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy index 76455f96..3d16bd4a 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy @@ -33,23 +33,23 @@ import static net.fabricmc.loom.test.LoomTestConstants.DEFAULT_GRADLE import static org.gradle.testkit.runner.TaskOutcome.SUCCESS class SimpleNeoForgeTest extends Specification implements GradleProjectTestTrait { - @Unroll - def "build #mcVersion #neoforgeVersion #mappings"() { - setup: - def gradle = gradleProject(project: "neoforge/simple", version: DEFAULT_GRADLE) - gradle.buildGradle.text = gradle.buildGradle.text.replace('@MCVERSION@', mcVersion) - .replace('@NEOFORGEVERSION@', neoforgeVersion) - .replace('@MAPPINGS@', mappings) + @Unroll + def "build #mcVersion #neoforgeVersion #mappings"() { + setup: + def gradle = gradleProject(project: "neoforge/simple", version: DEFAULT_GRADLE) + gradle.buildGradle.text = gradle.buildGradle.text.replace('@MCVERSION@', mcVersion) + .replace('@NEOFORGEVERSION@', neoforgeVersion) + .replace('@MAPPINGS@', mappings) - when: - def result = gradle.run(task: "build") + when: + def result = gradle.run(task: "build") - then: - result.task(":build").outcome == SUCCESS + then: + result.task(":build").outcome == SUCCESS - where: - mcVersion | neoforgeVersion | mappings - '1.20.2' | '20.2.5-beta' | 'loom.officialMojangMappings()' - '1.20.2' | '20.2.5-beta' | '"net.fabricmc:yarn:1.20.1+build.1:v2"' - } + where: + mcVersion | neoforgeVersion | mappings + '1.20.2' | '20.2.5-beta' | 'loom.officialMojangMappings()' + '1.20.2' | '20.2.5-beta' | '"net.fabricmc:yarn:1.20.1+build.1:v2"' + } }