Skip to content

Commit

Permalink
Enable HTTPs for Files server
Browse files Browse the repository at this point in the history
  • Loading branch information
LexManos committed Nov 13, 2018
1 parent ee3e3df commit 3996470
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ repositories {
mavenLocal()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
url = "https://files.minecraftforge.net/maven"
}
maven {
// because Srg2Source needs an eclipse dependency.
Expand Down Expand Up @@ -239,7 +239,7 @@ uploadArchives {

if (project.hasProperty('forgeMavenPass'))
{
repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
repository(url: "https://files.minecraftforge.net/maven/manage/upload") {
authentication(userName: "forge", password: project.getProperty('forgeMavenPass'))
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/sc/seis/launch4j/Launch4jPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class Launch4jPlugin implements Plugin<Project>
static final String TASK_RUN_NAME = "createExe";
static final String TASK_LAUNCH4J_NAME = "launch4j";

static final String URL_LAUNCH4J = "http://files.minecraftforge.net/launch4j/launch4j-3.8.0-" + Constants.OPERATING_SYSTEM + ".zip";
static final String URL_LAUNCH4J = "https://files.minecraftforge.net/launch4j/launch4j-3.8.0-" + Constants.OPERATING_SYSTEM + ".zip";

static final String ZIP_LAUNCH4J = "build/launch4j.zip";
static final String DIR_LAUNCH4J = "build/launch4j";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ protected void afterEvaluate()
// ApplyFernFlowerTask ffTask = ((ApplyFernFlowerTask) project.getTasks().getByName("decompileJar"));
// ffTask.setClasspath(javaConv.getSourceSets().getByName("main").getCompileClasspath());

// http://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp/1.7.10/mcp-1.7.10-srg.zip
// https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp/1.7.10/mcp-1.7.10-srg.zip
project.getDependencies().add(CONFIG_MAPPINGS, ImmutableMap.of(
"group", "de.oceanlabs.mcp",
"name", delayedString("mcp_" + REPLACE_MCP_CHANNEL).call(),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/minecraftforge/gradle/common/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ 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 = "http://files.minecraftforge.net/fernflower-fix-1.0.zip";
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_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 = "http://files.minecraftforge.net/maven";
public static final String URL_FORGE_MAVEN = "https://files.minecraftforge.net/maven";
public static final List<String> URLS_MCP_JSON = Arrays.asList(
URL_FORGE_MAVEN + "/de/oceanlabs/mcp/versions.json",
"http://export.mcpbot.bspk.rs/versions.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private PatcherConstants() {}

// installer stuff
static final String REPLACE_INSTALLER = "{INSTALLER}";
static final String INSTALLER_URL = "http://files.minecraftforge.net/maven/net/minecraftforge/installer/" + REPLACE_INSTALLER + "/installer-" + REPLACE_INSTALLER + "-shrunk.jar";
static final String INSTALLER_URL = "https://files.minecraftforge.net/maven/net/minecraftforge/installer/" + REPLACE_INSTALLER + "/installer-" + REPLACE_INSTALLER + "-shrunk.jar";

// new project defaults
static final String DEFAULT_PATCHES_DIR = "patches";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void setForgeVersion(String forgeVersion)
*
* @param inVersion The version
*
* @see <a href="http://files.minecraftforge.net">http://files.minecraftforge.net</a>
* @see <a href="https://files.minecraftforge.net">https://files.minecraftforge.net</a>
*/
@Override
public void setVersion(String inVersion)
Expand Down

0 comments on commit 3996470

Please sign in to comment.