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

Add back more missing code

Browse Source
This commit is contained in:
Juuz
2023-04-23 12:32:09 +03:00
parent 200b38096a
commit 9784c5491e
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,6 +132,12 @@ public abstract class CompileConfiguration implements Runnable {
configureDecompileTasks(configContext);
if (extension.isForge()) {
if (extension.isDataGenEnabled()) {
getProject().getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName("main").resources(files -> {
files.srcDir(getProject().file("src/generated/resources"));
});
}
// TODO: Find a better place for this?
// This has to be after dependencyManager.handleDependencies() above
// because of https://github.com/architectury/architectury-loom/issues/72.

7
src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
View File

@@ -36,6 +36,7 @@ import org.gradle.api.plugins.JavaPlugin;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.gradle.GradleUtils;
import net.fabricmc.loom.util.gradle.SourceSetHelper;
public abstract class LoomConfigurations implements Runnable {
@@ -110,6 +111,12 @@ public abstract class LoomConfigurations implements Runnable {
getDependencies().add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS);
getDependencies().add(JavaPlugin.TEST_COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS);
GradleUtils.afterSuccessfulEvaluation(getProject(), () -> {
if (extension.shouldGenerateSrgTiny()) {
registerNonTransitive(Constants.Configurations.SRG, Type.RESOLVABLE);
}
});
if (extension.isForge()) {
// Set up Forge configurations
registerNonTransitive(Constants.Configurations.FORGE, Type.RESOLVABLE);