Skip to content

Commit

Permalink
Fix compile for b320c41 (FabricMC#480)
Browse files Browse the repository at this point in the history
* Fix compile for b320c41

* Fix checkstyle
  • Loading branch information
shedaniel authored Aug 26, 2021
1 parent b320c41 commit 2277b93
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@
import org.jetbrains.annotations.NotNull;

import net.fabricmc.loom.extension.LoomFiles;

import net.fabricmc.loom.util.MirrorUtil;

public class LoomRepositoryPlugin implements Plugin<PluginAware> {
@Override
public void apply(@NotNull PluginAware target) {
if (target instanceof Settings settings) {
declareRepositories(settings.getDependencyResolutionManagement().getRepositories(), LoomFiles.create(settings));
declareRepositories(settings.getDependencyResolutionManagement().getRepositories(), LoomFiles.create(settings), settings);

// leave a marker so projects don't try to override these
settings.getGradle().getPluginManager().apply(LoomRepositoryPlugin.class);
Expand All @@ -51,26 +50,26 @@ public void apply(@NotNull PluginAware target) {
return;
}

declareRepositories(project.getRepositories(), LoomFiles.create(project));
declareRepositories(project.getRepositories(), LoomFiles.create(project), project);
} else if (target instanceof Gradle) {
return;
} else {
throw new IllegalArgumentException("Expected target to be a Project or Settings, but was a " + target.getClass());
}
}

private void declareRepositories(RepositoryHandler repositories, LoomFiles files) {
private void declareRepositories(RepositoryHandler repositories, LoomFiles files, ExtensionAware target) {
repositories.maven(repo -> {
repo.setName("UserLocalRemappedMods");
repo.setUrl(files.getRemappedModCache());
});
repositories.maven(repo -> {
repo.setName("Fabric");
repo.setUrl(MirrorUtil.getFabricRepository((ExtensionAware) target));
repo.setUrl(MirrorUtil.getFabricRepository(target));
});
repositories.maven(repo -> {
repo.setName("Mojang");
repo.setUrl(MirrorUtil.getLibrariesBase((ExtensionAware) target));
repo.setUrl(MirrorUtil.getLibrariesBase(target));
});
repositories.mavenCentral();

Expand Down

0 comments on commit 2277b93

Please sign in to comment.