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

Mark Forge repo as ignoreGradleMetadataRedirection if possible

Browse Source
This commit is contained in:
shedaniel
2021-01-18 14:50:07 +08:00
parent 3074054507
commit 854ffa813b
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableMap;
import org.gradle.api.Action;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.UnknownTaskException;
@@ -74,7 +75,16 @@ public final class CompileConfiguration {
public static void setupConfigurations(Project project) {
// Force add Mojang and Forge repositories
addMavenRepo(project, "Mojang", "https://libraries.minecraft.net/");
addMavenRepo(project, "Forge", "https://files.minecraftforge.net/maven/");
addMavenRepo(project, "Forge", "https://files.minecraftforge.net/maven/", repo -> {
repo.metadataSources(sources -> {
sources.mavenPom();
try {
MavenArtifactRepository.MetadataSources.class.getDeclaredMethod("ignoreGradleMetadataRedirection")
.invoke(sources);
} catch (Throwable ignored) {
}
});
});
Configuration modCompileClasspathConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MOD_COMPILE_CLASSPATH);
modCompileClasspathConfig.setTransitive(true);
@@ -154,9 +164,15 @@ public final class CompileConfiguration {
* @return An object containing the name and the URL of the repository that can be modified later
*/
public static MavenArtifactRepository addMavenRepo(Project target, final String name, final String url) {
return addMavenRepo(target, name, url, repo -> {
});
}
public static MavenArtifactRepository addMavenRepo(Project target, final String name, final String url, final Action<MavenArtifactRepository> action) {
return target.getRepositories().maven(repo -> {
repo.setName(name);
repo.setUrl(url);
action.execute(repo);
});
}

1
src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
View File

@@ -253,6 +253,7 @@ public class MojangMappingsDependency extends AbstractModuleDependency implement
@Override
public String getVersion() {
if (extension.getDependencyManager() == null) return "1.0.0";
return extension.getMinecraftProvider().getMinecraftVersion();
}