From 53a2b5b21a5fd6da29b6e30458679da3c4bb6cad Mon Sep 17 00:00:00 2001 From: Jab125 <67534807+Jab125@users.noreply.github.com> Date: Mon, 22 May 2023 23:00:02 +1000 Subject: [PATCH 1/4] Use https for resources --- src/main/java/net/minecraftforge/gradle/common/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; From f8aa4ec432c2b1072a3e1ca8fb9a2a2a81d9d318 Mon Sep 17 00:00:00 2001 From: Jab125 <67534807+Jab125@users.noreply.github.com> Date: Tue, 23 May 2023 20:14:59 +1000 Subject: [PATCH 2/4] stop gradle from erroring --- .../java/net/minecraftforge/gradle/tasks/ApplyS2STask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java index 1164a0d77..7d5d5f282 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java @@ -58,6 +58,10 @@ public class ApplyS2STask extends DefaultTask @InputFiles private final List exc = new LinkedList(); + public List getExc() { // stop complaining gradle + return exc; + } + @InputFile private Object rangeMap; From 1630ca47a5dd21b6527c4215179f81ee4a60e1bd Mon Sep 17 00:00:00 2001 From: Jab125 <67534807+Jab125@users.noreply.github.com> Date: Tue, 23 May 2023 20:21:55 +1000 Subject: [PATCH 3/4] attempt 2 --- .../java/net/minecraftforge/gradle/tasks/ApplyS2STask.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java index 7d5d5f282..22e4b91bf 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java @@ -54,6 +54,10 @@ 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(); @@ -74,6 +78,7 @@ public List getExc() { // stop complaining gradle // stuff defined on the tasks.. private final List in = new LinkedList(); + @Internal private Object out; @TaskAction @@ -349,6 +354,7 @@ public FileCollection getOuts() return getProject().files(outFile); } + @Internal public File getOut() { return getProject().file(out); @@ -359,6 +365,7 @@ public void setOut(Object out) this.out = out; } + @Internal public FileCollection getSrgs() { return getProject().files(srg); From 171feb686dbcf189584b676ef7db8d0828fd3715 Mon Sep 17 00:00:00 2001 From: Jab125 <67534807+Jab125@users.noreply.github.com> Date: Tue, 23 May 2023 20:28:03 +1000 Subject: [PATCH 4/4] attempt 3 --- src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java index 22e4b91bf..b4526dc3f 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java @@ -354,7 +354,6 @@ public FileCollection getOuts() return getProject().files(outFile); } - @Internal public File getOut() { return getProject().file(out); @@ -386,6 +385,7 @@ public void addSrg(File srg) this.srg.add(srg); } + @Internal public FileCollection getExcs() { return getProject().files(exc);