Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>
2026-04-02 21:47:42 -05:00 · 2021-07-20 23:44:11 +08:00
parent cea80b0119
commit 695863367f
25 changed files with 364 additions and 45 deletions
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
@@ -26,30 +26,49 @@ package net.fabricmc.loom.extension;

 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Supplier;

+import com.google.common.base.Suppliers;
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.plugins.BasePluginConvention;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.SourceSet;

+import net.fabricmc.loom.api.LoomGradleExtensionAPI;
 import net.fabricmc.loom.api.MixinApExtensionAPI;
 import net.fabricmc.loom.api.decompilers.LoomDecompiler;
-import net.fabricmc.loom.api.LoomGradleExtensionAPI;
+import net.fabricmc.loom.configuration.ide.RunConfig;
 import net.fabricmc.loom.configuration.ide.RunConfigSettings;
+import net.fabricmc.loom.configuration.launch.LaunchProviderSettings;
 import net.fabricmc.loom.configuration.processors.JarProcessor;
 import net.fabricmc.loom.configuration.providers.mappings.GradleMappingContext;
 import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpec;
 import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpecBuilder;
 import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingsDependency;
+import net.fabricmc.loom.util.ModPlatform;
+import net.fabricmc.loom.util.function.LazyBool;

 /**
 * This class implements the public extension api.
 */
 public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionAPI {
+	private static final String FORGE_PROPERTY = "loom.forge";
+	private static final String PLATFORM_PROPERTY = "loom.platform";
+	private static final String INCLUDE_PROPERTY = "loom.forge.include";
+
 	protected final List<LoomDecompiler> decompilers = new ArrayList<>();
 	protected final List<JarProcessor> jarProcessors = new ArrayList<>();
 	protected final ConfigurableFileCollection log4jConfigs;
@@ -62,10 +81,46 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA

 	private NamedDomainObjectContainer<RunConfigSettings> runConfigs;

+	// ===================
+	//  Architectury Loom
+	// ===================
+	private Property<ModPlatform> platform;
+	public List<String> mixinConfigs = new ArrayList<>(); // FORGE: Passed to Minecraft
+	public Set<File> accessTransformers = new HashSet<>();
+	public boolean useFabricMixin = true; // FORGE: Use Fabric Mixin for better refmap resolutions
+	private boolean silentMojangMappingsLicense = false;
+	public Boolean generateSrgTiny = null;
+	private final LazyBool supportsInclude;
+	private List<String> dataGenMods = new ArrayList<>();
+	private final List<String> tasksBeforeRun = Collections.synchronizedList(new ArrayList<>());
+	public final List<Supplier<SourceSet>> forgeLocalMods = Collections.synchronizedList(new ArrayList<>(Collections.singletonList(() ->
+			getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().getByName("main"))));
+	public final List<Consumer<RunConfig>> settingsPostEdit = new ArrayList<>();
+	private NamedDomainObjectContainer<LaunchProviderSettings> launchConfigs;
+
 	protected LoomGradleExtensionApiImpl(Project project, LoomFiles directories) {
 		this.runConfigs = project.container(RunConfigSettings.class,
 				baseName -> new RunConfigSettings(project, baseName));
 		this.log4jConfigs = project.files(directories.getDefaultLog4jConfigFile());
+		this.platform = project.getObjects().property(ModPlatform.class).convention(project.provider(Suppliers.memoize(() -> {
+			Object platformProperty = project.findProperty(PLATFORM_PROPERTY);
+
+			if (platformProperty != null) {
+				return ModPlatform.valueOf(Objects.toString(platformProperty).toUpperCase(Locale.ROOT));
+			}
+
+			Object forgeProperty = project.findProperty(FORGE_PROPERTY);
+
+			if (forgeProperty != null) {
+				project.getLogger().warn("Project " + project.getPath() + " is using property " + FORGE_PROPERTY + " to enable forge mode. Please use '" + PLATFORM_PROPERTY + " = forge' instead!");
+				return Boolean.parseBoolean(Objects.toString(forgeProperty)) ? ModPlatform.FORGE : ModPlatform.FABRIC;
+			}
+
+			return ModPlatform.FABRIC;
+		})::get));
+		this.supportsInclude = new LazyBool(() -> Boolean.parseBoolean(Objects.toString(project.findProperty(INCLUDE_PROPERTY))));
+		this.launchConfigs = project.container(LaunchProviderSettings.class,
+				baseName -> new LaunchProviderSettings(project, baseName));
 	}

 	@Override
@@ -113,16 +168,27 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA

 	@Override
 	public Dependency layered(Action<LayeredMappingSpecBuilder> action) {
-		LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder();
+		LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder(this);
 		action.execute(builder);
 		LayeredMappingSpec builtSpec = builder.build();
-		return new LayeredMappingsDependency(new GradleMappingContext(getProject(), "layers_" + builtSpec.getVersion().replace("+", "_").replace(".", "_")), builtSpec, builtSpec.getVersion());
+		return new LayeredMappingsDependency(new GradleMappingContext(getProject(), () -> {
+			return "layers/" + getMinecraftVersion() + "_" + builtSpec.getVersion().replace("+", "_").replace(".", "_");
+		}), builtSpec, builtSpec.getVersion());
 	}

+	protected abstract String getMinecraftVersion();
+
 	@Override
 	public String getRefmapName() {
 		if (refmapName == null || refmapName.isEmpty()) {
-			String defaultRefmapName = getProject().getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-refmap.json";
+			String defaultRefmapName;
+
+			if (getProject().getRootProject() == getProject()) {
+				defaultRefmapName = getProject().getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-refmap.json";
+			} else {
+				defaultRefmapName = getProject().getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName() + "-" + getProject().getPath().replaceFirst(":", "").replace(':', '_') + "-refmap.json";
+			}
+
 			getProject().getLogger().info("Could not find refmap definition, will be using default name: " + defaultRefmapName);
 			refmapName = defaultRefmapName;
 		}
@@ -182,6 +248,140 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA

 	protected abstract MixinApExtension getMixinApExtension();

+	@Override
+	public void silentMojangMappingsLicense() {
+		this.silentMojangMappingsLicense = true;
+	}
+
+	@Override
+	public boolean isSilentMojangMappingsLicenseEnabled() {
+		return silentMojangMappingsLicense;
+	}
+
+	@Override
+	public Property<ModPlatform> getPlatform() {
+		return platform;
+	}
+
+	@Override
+	public boolean supportsInclude() {
+		return !isForge() || supportsInclude.getAsBoolean();
+	}
+
+	@Override
+	public void setGenerateSrgTiny(Boolean generateSrgTiny) {
+		this.generateSrgTiny = generateSrgTiny;
+	}
+
+	@Override
+	public boolean shouldGenerateSrgTiny() {
+		if (generateSrgTiny != null) {
+			return generateSrgTiny;
+		}
+
+		return isForge();
+	}
+
+	@Override
+	public void launches(Action<NamedDomainObjectContainer<LaunchProviderSettings>> action) {
+		action.execute(launchConfigs);
+	}
+
+	@Override
+	public NamedDomainObjectContainer<LaunchProviderSettings> getLaunchConfigs() {
+		return launchConfigs;
+	}
+
+	@Override
+	public List<String> getDataGenMods() {
+		return dataGenMods;
+	}
+
+	@SuppressWarnings("Convert2Lambda")
+	@Override
+	public void localMods(Action<SourceSetConsumer> action) {
+		if (!isForge()) {
+			throw new UnsupportedOperationException("Not running with Forge support.");
+		}
+
+		action.execute(new SourceSetConsumer() {
+			@Override
+			public void add(Object... sourceSets) {
+				for (Object sourceSet : sourceSets) {
+					if (sourceSet instanceof SourceSet) {
+						forgeLocalMods.add(() -> (SourceSet) sourceSet);
+					} else {
+						forgeLocalMods.add(() -> getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName(String.valueOf(forgeLocalMods)));
+					}
+				}
+			}
+		});
+	}
+
+	@Override
+	public List<Supplier<SourceSet>> getForgeLocalMods() {
+		return forgeLocalMods;
+	}
+
+	@SuppressWarnings("Convert2Lambda")
+	@Override
+	public void dataGen(Action<DataGenConsumer> action) {
+		if (!isForge()) {
+			throw new UnsupportedOperationException("Not running with Forge support.");
+		}
+
+		action.execute(new DataGenConsumer() {
+			@Override
+			public void mod(String... modIds) {
+				dataGenMods.addAll(Arrays.asList(modIds));
+
+				if (modIds.length > 0 && getRunConfigs().findByName("data") == null) {
+					getRunConfigs().create("data", RunConfigSettings::data);
+				}
+			}
+		});
+	}
+
+	@Override
+	public List<String> getTasksBeforeRun() {
+		return tasksBeforeRun;
+	}
+
+	@Override
+	public void mixinConfig(String... config) {
+		mixinConfigs.addAll(Arrays.asList(config));
+	}
+
+	@Override
+	public List<String> getMixinConfigs() {
+		return mixinConfigs;
+	}
+
+	@Override
+	public void accessTransformer(Object file) {
+		this.accessTransformers.add(getProject().file(file));
+	}
+
+	@Override
+	public Set<File> getAccessTransformers() {
+		return accessTransformers;
+	}
+
+	@Override
+	public boolean isUseFabricMixin() {
+		return useFabricMixin;
+	}
+
+	@Override
+	public void setUseFabricMixin(boolean useFabricMixin) {
+		this.useFabricMixin = useFabricMixin;
+	}
+
+	@Override
+	public List<Consumer<RunConfig>> getSettingsPostEdit() {
+		return settingsPostEdit;
+	}
+
 	// This is here to ensure that LoomGradleExtensionApiImpl compiles without any unimplemented methods
 	private final class EnsureCompile extends LoomGradleExtensionApiImpl {
 		private EnsureCompile() {
@@ -203,5 +403,10 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
 		protected MixinApExtension getMixinApExtension() {
 			throw new RuntimeException("Yeah... something is really wrong");
 		}
+
+		@Override
+		protected String getMinecraftVersion() {
+			throw new RuntimeException("Yeah... something is really wrong");
+		}
 	}
 }