imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FabricMC/future/dev' into dev/future

Browse Source 
# Conflicts:
#	.github/workflows/test-push.yml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
This commit is contained in:
shedaniel
2021-05-05 02:21:49 +08:00
parent f0ec1b61dd 7ce072c47a
commit aba834b040
10 changed files with 190 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@@ -53,6 +53,7 @@ import org.jetbrains.annotations.ApiStatus;
import net.fabricmc.loom.api.decompilers.LoomDecompiler;
import net.fabricmc.loom.configuration.LoomDependencyManager;
import net.fabricmc.loom.configuration.LoomProjectData;
import net.fabricmc.loom.configuration.ide.RunConfig;
import net.fabricmc.loom.configuration.ide.RunConfigSettings;
import net.fabricmc.loom.configuration.launch.LaunchProviderSettings;
@@ -113,6 +114,9 @@ public class LoomGradleExtension {
@ApiStatus.Experimental
public final List<Consumer<RunConfig>> settingsPostEdit = new ArrayList<>();
@ApiStatus.Internal
private final LoomProjectData projectData;
private NamedDomainObjectContainer<RunConfigSettings> runConfigs;
private NamedDomainObjectContainer<LaunchProviderSettings> launchConfigs;
@@ -225,6 +229,7 @@ public class LoomGradleExtension {
this.launchConfigs = project.container(LaunchProviderSettings.class,
baseName -> new LaunchProviderSettings(project, baseName));
this.log4jConfigs = project.files(getDefaultLog4jConfigFile());
projectData = new LoomProjectData(project);
}
/**
@@ -534,4 +539,9 @@ public class LoomGradleExtension {
public NamedDomainObjectContainer<LaunchProviderSettings> getLaunchConfigs() {
return launchConfigs;
}
@ApiStatus.Internal
public LoomProjectData getProjectData() {
return projectData;
}
}