From a1eb26aee265cc07b49e47ddd72f0548468c6a95 Mon Sep 17 00:00:00 2001 From: SizableShrimp Date: Sat, 11 Dec 2021 11:03:15 -0600 Subject: [PATCH] [1.13.x] Update Installer to 2.1.+ (#8288) * Update Installer to 2.1.+ Signed-off-by: SizableShrimp * Update references of files.mcf.net/maven to maven.mcf.net Signed-off-by: SizableShrimp --- build.gradle | 7 +++---- mdk/build.gradle | 3 +-- src/main/resources/META-INF/mods.toml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index ee83dcc881..d8a7514505 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,7 @@ buildscript { repositories { mavenLocal() - maven { url = 'https://files.minecraftforge.net/maven' } - jcenter() + maven { url = 'https://maven.minecraftforge.net/' } mavenCentral() } dependencies { @@ -733,7 +732,7 @@ project(':forge') { } task downloadInstaller(type: DownloadMavenArtifact) { - artifact = 'net.minecraftforge:installer:2.0.+:shrunk' + artifact = 'net.minecraftforge:installer:2.1.+:shrunk' changing = true } @@ -1011,7 +1010,7 @@ def getArtifacts(project, config, classifiers) { def path = "${folder}${filename}" def url = "https://libraries.minecraft.net/${path}" if (!checkExists(url)) { - url = "https://files.minecraftforge.net/maven/${path}" + url = "https://maven.minecraftforge.net/${path}" } //TODO remove when Mojang launcher is updated if (!classifiers && art.classifier != null) { //Mojang launcher doesn't currently support classifiers, so... move it to part of the version, and force the extension to 'jar' diff --git a/mdk/build.gradle b/mdk/build.gradle index f693e19133..38e60ef257 100644 --- a/mdk/build.gradle +++ b/mdk/build.gradle @@ -1,7 +1,6 @@ buildscript { repositories { - maven { url = 'https://files.minecraftforge.net/maven' } - jcenter() + maven { url = 'https://maven.minecraftforge.net/' } mavenCentral() } dependencies { diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f90ca51ab8..f9f1ee974f 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -7,7 +7,7 @@ logoFile="forge_logo.png" modId="forge" # We use the global forge version version="${global.forgeVersion}" - updateJSONURL="https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json" + updateJSONURL="https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json" displayName="Forge" credits="LexManos,cpw,Mezz,fry,tterrag,gigaherz,illy" authors="LexManos,cpw,Mezz,fry,Spacetoad,Eloraam"