Skip to content

Use https for resources.download.minecraft.net #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: FG_2.3
Choose a base branch
from
Open

Use https for resources.download.minecraft.net #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53a2b5b
Use https for resources
Jab125 May 22, 2023
f8aa4ec
stop gradle from erroring
Jab125 May 23, 2023
1630ca4
attempt 2
Jab125 May 23, 2023
171feb6
attempt 3
Jab125 May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/minecraftforge/gradle/common/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,18 @@ public class ApplyS2STask extends DefaultTask
@InputFiles
private final List<Object> srg = new LinkedList<Object>();

public List<Object> getSrg() {
return srg;
}

@Optional
@InputFiles
private final List<Object> exc = new LinkedList<Object>();

public List<Object> getExc() { // stop complaining gradle
return exc;
}

@InputFile
private Object rangeMap;

Expand All @@ -70,6 +78,7 @@ public class ApplyS2STask extends DefaultTask

// stuff defined on the tasks..
private final List<Object> in = new LinkedList<Object>();
@Internal
private Object out;

@TaskAction
Expand Down Expand Up @@ -355,6 +364,7 @@ public void setOut(Object out)
this.out = out;
}

@Internal
public FileCollection getSrgs()
{
return getProject().files(srg);
Expand All @@ -375,6 +385,7 @@ public void addSrg(File srg)
this.srg.add(srg);
}

@Internal
public FileCollection getExcs()
{
return getProject().files(exc);
Expand Down