From 9dcd7402116b10720953fd55333e4295da1711d5 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 13 Apr 2022 19:58:48 -0700
Subject: [PATCH] Replace third party repos with Paper repo (#7733)

we now mirror Fabric, Forge, and Mojang
---
 Paper-MojangAPI/build.gradle.kts               |  5 -----
 build.gradle.kts                               | 18 +++++++-----------
 patches/server/Build-system-changes.patch      |  2 +-
 ...cktraces-in-log-messages-crash-report.patch | 12 ------------
 .../Implement-Brigadier-Mojang-API.patch       |  2 +-
 patches/server/Setup-Gradle-project.patch      |  4 ----
 ...soleAppender-for-console-improvements.patch |  2 +-
 7 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/Paper-MojangAPI/build.gradle.kts b/Paper-MojangAPI/build.gradle.kts
index c90209011a..3275a3bf46 100644
--- a/Paper-MojangAPI/build.gradle.kts
+++ b/Paper-MojangAPI/build.gradle.kts
@@ -8,11 +8,6 @@ java {
     withJavadocJar()
 }
 
-repositories {
-    mavenCentral()
-    maven("https://libraries.minecraft.net")
-}
-
 dependencies {
     implementation(project(":paper-api"))
     api("com.mojang:brigadier:1.0.18")
diff --git a/build.gradle.kts b/build.gradle.kts
index 5b5488b0ab..0e84984462 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,6 +19,8 @@ allprojects {
     }
 }
 
+val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"
+
 subprojects {
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
@@ -38,13 +40,9 @@ subprojects {
         }
     }
 
-    if (name == "Paper-MojangAPI") {
-        return@subprojects
-    }
-
     repositories {
         mavenCentral()
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven(paperMavenPublicUrl)
     }
 }
 
@@ -52,7 +50,7 @@ val spigotDecompiler: Configuration by configurations.creating
 
 repositories {
     mavenCentral()
-    maven("https://papermc.io/repo/repository/maven-public/") {
+    maven(paperMavenPublicUrl) {
         content {
             onlyForConfigurations(
                 configurations.paperclip.name,
@@ -74,9 +72,9 @@ paperweight {
     minecraftVersion.set(providers.gradleProperty("mcVersion"))
     serverProject.set(project(":paper-server"))
 
-    paramMappingsRepo.set("https://maven.fabricmc.net/")
-    remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://files.minecraftforge.net/maven/")
+    paramMappingsRepo.set(paperMavenPublicUrl)
+    remapRepo.set(paperMavenPublicUrl)
+    decompileRepo.set(paperMavenPublicUrl)
 
     craftBukkit {
         fernFlowerJar.set(layout.file(spigotDecompiler.elements.map { it.single().asFile }))
@@ -108,9 +106,7 @@ tasks.generateDevelopmentBundle {
     mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
     libraryRepositories.addAll(
         "https://repo.maven.apache.org/maven2/",
-        "https://libraries.minecraft.net/",
         "https://papermc.io/repo/repository/maven-public/",
-        "https://maven.fabricmc.net/",
     )
 }
 
diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch
index 2b71de9e89..aaa4e66bd4 100644
--- a/patches/server/Build-system-changes.patch
+++ b/patches/server/Build-system-changes.patch
@@ -8,7 +8,7 @@ diff --git a/build.gradle.kts b/build.gradle.kts
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -0,0 +0,0 @@ repositories {
+@@ -0,0 +0,0 @@ plugins {
  dependencies {
      implementation(project(":paper-api"))
      implementation("jline:jline:2.12.1")
diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 59b13d858f..be0736664b 100644
--- a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -16,18 +16,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  plugins {
      java
-@@ -0,0 +0,0 @@ plugins {
- 
- repositories {
-     maven("https://libraries.minecraft.net/")
-+    // Paper start
-+    maven("https://maven.fabricmc.net/") {
-+        mavenContent { includeModule("net.fabricmc", "mapping-io") }
-+    }
-+    // Paper end
- }
- 
- dependencies {
 @@ -0,0 +0,0 @@ dependencies {
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
diff --git a/patches/server/Implement-Brigadier-Mojang-API.patch b/patches/server/Implement-Brigadier-Mojang-API.patch
index 1366faba7f..db93597da6 100644
--- a/patches/server/Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/Implement-Brigadier-Mojang-API.patch
@@ -13,7 +13,7 @@ diff --git a/build.gradle.kts b/build.gradle.kts
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -0,0 +0,0 @@ repositories {
+@@ -0,0 +0,0 @@ plugins {
  
  dependencies {
      implementation(project(":paper-api"))
diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index ea1b11bd69..e2eb559e0e 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -40,10 +40,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    id("com.github.johnrengelman.shadow")
 +}
 +
-+repositories {
-+    maven("https://libraries.minecraft.net/")
-+}
-+
 +dependencies {
 +    implementation(project(":paper-api"))
 +    implementation("jline:jline:2.12.1")
diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
index 93c5d25a06..3931c6b3d1 100644
--- a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -22,7 +22,7 @@ diff --git a/build.gradle.kts b/build.gradle.kts
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -0,0 +0,0 @@ repositories {
+@@ -0,0 +0,0 @@ plugins {
  
  dependencies {
      implementation(project(":paper-api"))