Update for new forge maven repo

MinecraftForge · Apr 22, 2021 · 541e148 · 541e148
1 parent c5ac9dd
commit 541e148
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ repositories {
     mavenLocal()
     maven {
         name = "forge"
-        url = "https://files.minecraftforge.net/maven"
+        url = "https://maven.minecraftforge.net"
     }
     maven {
         // because Srg2Source needs an eclipse dependency.
@@ -110,6 +110,12 @@ dependencies {
 
     compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.3-2"
     testCompile 'junit:junit:4.12'
+
+    constraints {
+        compile('org.eclipse.jdt:org.eclipse.jdt.core:3.12.3') {
+            because 'Srg2Source depends on a snapshot version which the forge maven has stopped serving'
+        }
+    }
 }
 
 wrapper {

diff --git a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
@@ -248,7 +248,7 @@ protected void afterEvaluate()
 //        ApplyFernFlowerTask ffTask = ((ApplyFernFlowerTask) project.getTasks().getByName("decompileJar"));
 //        ffTask.setClasspath(javaConv.getSourceSets().getByName("main").getCompileClasspath());
 
-        // https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp/1.7.10/mcp-1.7.10-srg.zip
+        // https://maven.minecraftforge.net/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(),

diff --git a/src/main/java/net/minecraftforge/gradle/common/Constants.java b/src/main/java/net/minecraftforge/gradle/common/Constants.java
@@ -120,7 +120,7 @@ public Boolean call(Object o)
     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     = "https://files.minecraftforge.net/maven";
+    public static final String URL_FORGE_MAVEN     = "https://maven.minecraftforge.net";
     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"

diff --git a/src/main/java/net/minecraftforge/gradle/patcher/PatcherConstants.java b/src/main/java/net/minecraftforge/gradle/patcher/PatcherConstants.java
@@ -29,7 +29,7 @@ private PatcherConstants() {}
 
     // installer stuff
     static final String REPLACE_INSTALLER        = "{INSTALLER}";
-    static final String INSTALLER_URL            = "https://files.minecraftforge.net/maven/net/minecraftforge/installer/" + REPLACE_INSTALLER + "/installer-" + REPLACE_INSTALLER + "-shrunk.jar";
+    static final String INSTALLER_URL            = "https://maven.minecraftforge.net/net/minecraftforge/installer/" + REPLACE_INSTALLER + "/installer-" + REPLACE_INSTALLER + "-shrunk.jar";
 
     // new project defaults
     static final String DEFAULT_PATCHES_DIR      = "patches";

diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgeExtension.java
@@ -133,7 +133,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: