diff --git a/src/main/java/net/minecraftforge/gradle/common/Constants.java b/src/main/java/net/minecraftforge/gradle/common/Constants.java index 005db9835..07fd669d5 100644 --- a/src/main/java/net/minecraftforge/gradle/common/Constants.java +++ b/src/main/java/net/minecraftforge/gradle/common/Constants.java @@ -117,7 +117,7 @@ public Boolean call(Object o) // urls public static final String URL_MC_MANIFEST = "https://launchermeta.mojang.com/mc/game/version_manifest.json"; public static final String URL_FF = "https://files.minecraftforge.net/fernflower-fix-1.0.zip"; - public static final String URL_ASSETS = "http://resources.download.minecraft.net"; + public static final String URL_ASSETS = "https://resources.download.minecraft.net"; public static final String URL_LIBRARY = "https://libraries.minecraft.net/"; // Mojang's Cloudflare front end //public static final String URL_LIBRARY = "https://minecraft-libraries.s3.amazonaws.com/"; // Mojang's AWS server, as Cloudflare is having issues, TODO: Switch back to above when their servers are fixed. public static final String URL_FORGE_MAVEN = "https://maven.minecraftforge.net"; diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java index 1164a0d77..b4526dc3f 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java @@ -54,10 +54,18 @@ public class ApplyS2STask extends DefaultTask @InputFiles private final List srg = new LinkedList(); + public List getSrg() { + return srg; + } + @Optional @InputFiles private final List exc = new LinkedList(); + public List getExc() { // stop complaining gradle + return exc; + } + @InputFile private Object rangeMap; @@ -70,6 +78,7 @@ public class ApplyS2STask extends DefaultTask // stuff defined on the tasks.. private final List in = new LinkedList(); + @Internal private Object out; @TaskAction @@ -355,6 +364,7 @@ public void setOut(Object out) this.out = out; } + @Internal public FileCollection getSrgs() { return getProject().files(srg); @@ -375,6 +385,7 @@ public void addSrg(File srg) this.srg.add(srg); } + @Internal public FileCollection getExcs() { return getProject().files(exc);