imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 12:17:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Code style and related fixes

Browse Source
This commit is contained in:
Juuz
2023-10-31 19:37:14 +02:00
parent 3757dd0030
commit dfa74148de
12 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -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 {

3
src/main/java/dev/architectury/loom/util/MappingOption.java
View File

@@ -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()) {

3
src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
View File

@@ -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;

7
src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java
View File

@@ -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;

4
src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
View File

@@ -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;

2
src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java
View File

@@ -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));

4
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
View File

@@ -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;

7
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java
View File

@@ -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<M extends MinecraftProvider> extends AbstractMappedMinecraftProvider<M> permits MojangMappedMinecraftProvider.MergedImpl, MojangMappedMinecraftProvider.SingleJarImpl, MojangMappedMinecraftProvider.SplitImpl {
public MojangMappedMinecraftProvider(Project project, M minecraftProvider) {
super(project, minecraftProvider);

4
src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
View File

@@ -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;

3
src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
View File

@@ -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;

2
src/main/java/net/fabricmc/loom/util/ModPlatform.java
View File

@@ -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);

32
src/test/groovy/net/fabricmc/loom/test/integration/neoforge/SimpleNeoForgeTest.groovy
View File

@@ -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"'
}
}