diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 314f7eb2..d71354dd 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -155,6 +155,24 @@ public class AbstractPlugin implements Plugin { flatDirectoryArtifactRepository.setName("LoomCacheFiles"); }); + project1.getRepositories().maven(mavenArtifactRepository -> { + mavenArtifactRepository.setName("FabricMC"); + mavenArtifactRepository.setUrl("http://maven.fabricmc.net/"); + }); + + project1.getRepositories().maven(mavenArtifactRepository -> { + mavenArtifactRepository.setName("SpongePowered"); + mavenArtifactRepository.setUrl("http://repo.spongepowered.org/maven"); + }); + + project1.getRepositories().maven(mavenArtifactRepository -> { + mavenArtifactRepository.setName("Mojang"); + mavenArtifactRepository.setUrl("https://libraries.minecraft.net/"); + }); + + project1.getRepositories().mavenCentral(); + project1.getRepositories().jcenter(); + Gson gson = new Gson(); try { DownloadTask.downloadMcJson(extension, project1.getLogger()); @@ -173,6 +191,10 @@ public class AbstractPlugin implements Plugin { } project1.getDependencies().add(Constants.CONFIG_MC_DEPENDENCIES, "net.minecraft:" + Constants.MINECRAFT_CLIENT_MAPPED_JAR.get(extension).getName().replace(".jar", "")); + if(extension.fabricVersion != null && !extension.fabricVersion.isEmpty()){ + //only add this when not in a fabric dev env + project1.getDependencies().add(Constants.CONFIG_MC_DEPENDENCIES, "net.fabricmc:fabric-base:" + extension.version + "-" + extension.fabricVersion); + } }); diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 7c3c5c8a..1684ef50 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -27,4 +27,5 @@ package net.fabricmc.loom; public class LoomGradleExtension { public String version; public String runDir = "run"; + public String fabricVersion; }