diff --git a/build.gradle b/build.gradle index 198138e17..588225157 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ repositories { mavenLocal() maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "http://maven.minecraftforge.net" } maven { // because Srg2Source needs an eclipse dependency. @@ -31,9 +31,8 @@ repositories { url = "https://repo.eclipse.org/content/groups/eclipse/" } maven { - // because SpecialSource doesnt have a full release - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" + name = "central" + url = "https://repo1.maven.org/maven2" } mavenCentral() maven { diff --git a/docs/reference/mcblock.md b/docs/reference/mcblock.md index 11879cb6c..7c2d2c0cd 100644 --- a/docs/reference/mcblock.md +++ b/docs/reference/mcblock.md @@ -11,7 +11,7 @@ There are some public methods in the minecraft extension object that are meant t - `String getApiVersion()` - Specifically returns the MinecraftForge or FML version in form `McVersion-#.#.#.#`. the branch is appended if it exists resulting in the following: `McVersion-#.#.#.#-branch` - `void setVersion(String version)` - - The argument passed to this method is parsed and verified against the [forge](http://files.minecraftforge.net/maven/net/minecraftforge/forge/json) or [fml](http://files.minecraftforge.net/maven/net/minecraftforge/fml/json) jsons. + - The argument passed to this method is parsed and verified against the [forge](http://maven.minecraftforge.net/net/minecraftforge/forge/json) or [fml](http://maven.minecraftforge.net/net/minecraftforge/fml/json) jsons. - Possible argument notations: - A forge/fml buildnumber, eg: `1232` - A forge/fml promotion,, eg: `1.7.10-latest`, `1.7.10-recommended` diff --git a/src/main/java/net/minecraftforge/gradle/common/Constants.java b/src/main/java/net/minecraftforge/gradle/common/Constants.java index 8888c690b..c9975002b 100644 --- a/src/main/java/net/minecraftforge/gradle/common/Constants.java +++ b/src/main/java/net/minecraftforge/gradle/common/Constants.java @@ -48,15 +48,15 @@ public Boolean call(Object o) { public static final String MC_JSON_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/{MC_VERSION}.json"; public static final String MC_JAR_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/{MC_VERSION}.jar"; public static final String MC_SERVER_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/minecraft_server.{MC_VERSION}.jar"; - public static final String MCP_URL = "http://files.minecraftforge.net/fernflower-fix-1.0.zip"; + public static final String MCP_URL = "https://files.minecraftforge.net/fernflower-fix-1.0.zip"; public static final String ASSETS_URL = "http://resources.download.minecraft.net"; public static final String LIBRARY_URL = "https://libraries.minecraft.net/"; - public static final String FORGE_MAVEN = "http://files.minecraftforge.net/maven"; + public static final String FORGE_MAVEN = "https://maven.minecraftforge.net"; public static final String ASSETS_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/{ASSET_INDEX}.json"; // MCP things public static final String CONFIG_MCP_DATA = "mcpSnapshotDataConfig"; - public static final String MCP_JSON_URL = "http://export.mcpbot.bspk.rs/versions.json"; + public static final String MCP_JSON_URL = FORGE_MAVEN + "/de/oceanlabs/mcp/versions.json"; // things in the cache dir. public static final String NATIVES_DIR = "{CACHE_DIR}/minecraft/net/minecraft/minecraft_natives/{MC_VERSION}"; diff --git a/src/main/java/net/minecraftforge/gradle/dev/DevConstants.java b/src/main/java/net/minecraftforge/gradle/dev/DevConstants.java index 7b9577b80..50a3c2006 100644 --- a/src/main/java/net/minecraftforge/gradle/dev/DevConstants.java +++ b/src/main/java/net/minecraftforge/gradle/dev/DevConstants.java @@ -7,7 +7,7 @@ private DevConstants() { } - static final String INSTALLER_URL = "http://files.minecraftforge.net/maven/net/minecraftforge/installer/{INSTALLER_VERSION}/installer-{INSTALLER_VERSION}-shrunk.jar"; + static final String INSTALLER_URL = "http://maven.minecraftforge.net/net/minecraftforge/installer/{INSTALLER_VERSION}/installer-{INSTALLER_VERSION}-shrunk.jar"; static final String LAUNCH4J_URL = "http://files.minecraftforge.net/launch4j/launch4j-3.0.0-" + Constants.OPERATING_SYSTEM + "-" + Constants.SYSTEM_ARCH + ".zip"; static final String DEOBF_DATA = "{CACHE_DIR}/minecraft/net/minecraft/minecraft_srg/{MC_VERSION}/deobfuscation_data-{MC_VERSION}.lzma"; diff --git a/src/main/java/net/minecraftforge/gradle/tasks/dev/GenDevProjectsTask.java b/src/main/java/net/minecraftforge/gradle/tasks/dev/GenDevProjectsTask.java index cfc6b7fcb..88e5fed1d 100644 --- a/src/main/java/net/minecraftforge/gradle/tasks/dev/GenDevProjectsTask.java +++ b/src/main/java/net/minecraftforge/gradle/tasks/dev/GenDevProjectsTask.java @@ -81,7 +81,7 @@ private void writeFile() throws IOException { " maven", " {", " name 'forge'", - " url 'http://files.minecraftforge.net/maven'", + " url 'https://maven.minecraftforge.net'", " }", " mavenCentral()", " maven", diff --git a/src/main/java/net/minecraftforge/gradle/user/patch/UserPatchExtension.java b/src/main/java/net/minecraftforge/gradle/user/patch/UserPatchExtension.java index 8e4b11698..93f028339 100644 --- a/src/main/java/net/minecraftforge/gradle/user/patch/UserPatchExtension.java +++ b/src/main/java/net/minecraftforge/gradle/user/patch/UserPatchExtension.java @@ -104,7 +104,7 @@ private void checkAndSetVersion(String str) { * Output: 1.8-11.14.4.1563 * Solution: * Again, Abrar downloaded a 2MB MASSIVE json file, when a slim json would do. - * https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json + * https://maven.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json * * * API-Wildcards: