Replace third party repos with Paper repo

2024-11-14 20:10:05 +01:00 · 2022-04-13 20:34:45 -07:00 · 2022-04-13 20:34:45 -07:00 · 6625db387e
Commit 6625db387e
--- a/Paper-MojangAPI/build.gradle.kts
+++ b/Paper-MojangAPI/build.gradle.kts
@ -10,11 +10,6 @@ java {
    withJavadocJar()
 }

-repositories {
-    mavenCentral()
-    maven("https://libraries.minecraft.net")
-}
-
 dependencies {
    implementation(project(":Paper-API"))
    api("com.mojang:brigadier:1.0.18")
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -16,6 +16,8 @@ allprojects {
    }
 }

+val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"
+
 subprojects {
    tasks.withType<JavaCompile> {
        options.encoding = Charsets.UTF_8.name()
@ -28,13 +30,9 @@ subprojects {
        filteringCharset = Charsets.UTF_8.name()
    }

-    if (name == "Paper-MojangAPI") {
-        return@subprojects
-    }
-
    repositories {
        mavenCentral()
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven(paperMavenPublicUrl)
    }
 }

@ -42,7 +40,7 @@ val spigotDecompiler: Configuration by configurations.creating

 repositories {
    mavenCentral()
-    maven("https://papermc.io/repo/repository/maven-public/") {
+    maven(paperMavenPublicUrl) {
        content {
            onlyForConfigurations(
                configurations.paperclip.name,
@ -64,9 +62,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 }))
@ -100,8 +98,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/",
+        paperMavenPublicUrl,
    )
 }

--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b4534df4812
+index 0000000000000000000000000000000000000000..0179e2ebaa655611328d9d7a9f86955b5bbf7cb6
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,170 @@
+@@ -0,0 +1,166 @@
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 +import io.papermc.paperweight.util.*
@ -44,10 +44,6 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +    id("com.github.johnrengelman.shadow")
 +}
 +
-+repositories {
-+    maven("https://libraries.minecraft.net/")
-+}
-+
 +dependencies {
 +    implementation(project(":Paper-API"))
 +    implementation("jline:jline:2.12.1")
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68ff602a310 100644
+index 0179e2ebaa655611328d9d7a9f86955b5bbf7cb6..4bec3711869a1f0cfb324aabcd950cf0d9cce64b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,21 +17,23 @@ repositories {
+@@ -13,21 +13,23 @@ plugins {
 dependencies {
     implementation(project(":Paper-API"))
     implementation("jline:jline:2.12.1")
@ -36,7 +36,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
     testImplementation("junit:junit:4.13.1")
     testImplementation("org.hamcrest:hamcrest-library:1.3")
 }
-@@ -52,6 +54,7 @@ tasks.jar {
+@@ -48,6 +50,7 @@ tasks.jar {
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
             "Specification-Vendor" to "Bukkit Team",
@ -44,7 +44,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
         )
         for (tld in setOf("net", "com", "org")) {
             attributes("$tld/bukkit", "Sealed" to true)
-@@ -82,7 +85,7 @@ relocation {
+@@ -78,7 +81,7 @@ relocation {
     sequenceOf(
         "commons-codec:commons-codec" to "org.apache.commons.codec",
         "commons-io:commons-io" to "org.apache.commons.io",
@ -53,7 +53,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
         "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
         "org.ow2.asm:asm" to "org.objectweb.asm"
     ).forEach { (owner, pack) ->
-@@ -102,9 +105,17 @@ relocation {
+@@ -98,9 +101,17 @@ relocation {
     }
 }
 
--- a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -19,10 +19,10 @@ Other changes:
    configuration

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1f4c0f2156c588fcbb3b0329a416dc20a4b355a8..ba7f0c199c60c062d399586e5c9a0d3da8ddb013 100644
+index 4bec3711869a1f0cfb324aabcd950cf0d9cce64b..0f88c4b11c0ee4aa46a7b9df0436cc074956987c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -16,7 +16,17 @@ repositories {
+@@ -12,7 +12,17 @@ plugins {
 
 dependencies {
     implementation(project(":Paper-API"))
@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b70123deec6470c8bcf46df7418086f31e893fe..031bd2ed5c6fd2a859e8a69c48db3938cf71d61b 100644
+index 0e333b878908b2f83d0a8a83ba475aab2a57f192..7557218fb81ffc1fa81add9231923a4e664d3b83 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -9,6 +9,7 @@ import com.mojang.authlib.GameProfile;
@ -244,7 +244,7 @@ index 71991aee0d60299f744c896075502d1b436b3e44..0eea43c994e76b466fdda8ecd145d0b1
 
         this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 50427b48a0f823cff8826ca205a9af16b2e2fe93..696e2495ee8046c78ed53126db0e6c696c77c00d 100644
+index 978f3fe7c7547a923d015d9102b745f373f0db80..724d82995017118c3f3f71833ee83d9193f8dd7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -47,7 +47,6 @@ import java.util.function.Consumer;
--- a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9b70376813531718c02082633e9f8105f4879a63..fc8ffeea3e808eb1381f85972adffc614937ef6d 100644
+index 0f88c4b11c0ee4aa46a7b9df0436cc074956987c..bb46f7c5b1203dec12372f51c5a53cfe12ae2bd9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -25,7 +25,7 @@ dependencies {
+@@ -21,7 +21,7 @@ dependencies {
           all its classes to check if they are plugins.
           Scanning takes about 1-2 seconds so adding this speeds up the server start.
      */
--- a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread


 diff --git a/build.gradle.kts b/build.gradle.kts
-index fc8ffeea3e808eb1381f85972adffc614937ef6d..c981944f4a5d40ec14ade9aaa22041887a317e1f 100644
+index bb46f7c5b1203dec12372f51c5a53cfe12ae2bd9..1610d0c3ecb5fc06a160c3e1f05cb276bc80b73e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -37,6 +37,7 @@ dependencies {
+@@ -33,6 +33,7 @@ dependencies {
     }
     runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
     runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
--- a/patches/server/0422-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0422-Implement-Brigadier-Mojang-API.patch
@ -10,10 +10,10 @@ Adds CommandRegisteredEvent
  - Allows manipulating the CommandNode to add more children/metadata for the client

 diff --git a/build.gradle.kts b/build.gradle.kts
-index b91eca079738eb5b48b516915c52511c3bddd831..a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46 100644
+index 1610d0c3ecb5fc06a160c3e1f05cb276bc80b73e..2955dc6db42ed1f057f6817e7ccae5be9f231585 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -16,6 +16,7 @@ repositories {
+@@ -12,6 +12,7 @@ plugins {
 
 dependencies {
     implementation(project(":Paper-API"))
--- a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and


 diff --git a/build.gradle.kts b/build.gradle.kts
-index a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46..974f0bbbd3d271d28ce884490dc68b68849a07c3 100644
+index 2955dc6db42ed1f057f6817e7ccae5be9f231585..f7555720d22fdf642d36a1c0d8a9933ab3544b68 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -1,7 +1,9 @@
@ -19,19 +19,7 @@ index a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46..974f0bbbd3d271d28ce884490dc68b68
 import java.util.Locale
 
 plugins {
-@@ -12,6 +14,11 @@ plugins {
- 
- repositories {
-     maven("https://libraries.minecraft.net/")
-+    // Paper start
-+    maven("https://maven.fabricmc.net/") {
-+        mavenContent { includeModule("net.fabricmc", "mapping-io") }
-+    }
-+    // Paper end
- }
- 
- dependencies {
-@@ -46,6 +53,8 @@ dependencies {
+@@ -42,6 +44,8 @@ dependencies {
 
     implementation("io.netty:netty-all:4.1.65.Final") // Paper
 
@ -40,7 +28,7 @@ index a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46..974f0bbbd3d271d28ce884490dc68b68
     testImplementation("junit:junit:4.13.1")
     testImplementation("org.hamcrest:hamcrest-library:1.3")
 }
-@@ -95,6 +104,7 @@ relocation {
+@@ -91,6 +95,7 @@ relocation {
 
     relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
     sequenceOf(
@ -48,7 +36,7 @@ index a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46..974f0bbbd3d271d28ce884490dc68b68
         "commons-codec:commons-codec" to "org.apache.commons.codec",
         "commons-io:commons-io" to "org.apache.commons.io",
         //"it.unimi.dsi:fastutil" to "it.unimi", // Paper - don't relocate fastutil
-@@ -139,6 +149,45 @@ tasks.shadowJar {
+@@ -135,6 +140,45 @@ tasks.shadowJar {
     transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
 }
 
--- a/patches/server/0430-Implement-Mob-Goal-API.patch
+++ b/patches/server/0430-Implement-Mob-Goal-API.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API


 diff --git a/build.gradle.kts b/build.gradle.kts
-index f802d9e803b406cb9b5b4bce7de6858eba0fae7e..27f8a99f35a22f334e8023c1c9048e3a88a63d6f 100644
+index f7555720d22fdf642d36a1c0d8a9933ab3544b68..df0b06d0c582e9ec9f5dff74456e0ace64fc079f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -55,6 +55,7 @@ dependencies {
+@@ -46,6 +46,7 @@ dependencies {
 
     implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
 
@ -798,7 +798,7 @@ index fabd20265863751ad980ee4a697f3f0d47df101f..3a4da2bb86a742985d309eb325dc843a
         LOOK,
         JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1e34f8d2c3b14ed6a42930099d3130c4d589d48c..df5a9d6b1b8117080ede57f443dc79b875145461 100644
+index 4cb95a3757205d010ca652e79a12c596f433b300..73fbd6f092ecbc016d53588c4eafabfa3604a1b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2570,5 +2570,11 @@ public final class CraftServer implements Server {
--- a/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
@ -6,10 +6,10 @@ Subject: [PATCH] Add support for hex color codes in console
 Converts upstream's hex color code legacy format into actual hex color codes in the console.

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 57edac376bcbd056fb8fc7f0a433e946bce4ff2e..f3db86346c5e7bf446707a746f3094f7f27e09c4 100644
+index df0b06d0c582e9ec9f5dff74456e0ace64fc079f..a744a8e5917ded1488f377d3ed2c30c41132a03d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -34,6 +34,7 @@ dependencies {
+@@ -25,6 +25,7 @@ dependencies {
           Scanning takes about 1-2 seconds so adding this speeds up the server start.
      */
     implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
--- a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
+++ b/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Add git branch and commit to manifest


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1e4e3c6fbac820fa03e2a6f5d76c008d5879d2e6..c7ebad49e04c36c27341cabc4a024f170d762f3f 100644
+index a744a8e5917ded1488f377d3ed2c30c41132a03d..35266258f7eddba51a6e2b334046954213d88237 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -69,6 +69,7 @@ tasks.jar {
+@@ -60,6 +60,7 @@ tasks.jar {
         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
         val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
         val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@ -16,7 +16,7 @@ index 1e4e3c6fbac820fa03e2a6f5d76c008d5879d2e6..c7ebad49e04c36c27341cabc4a024f17
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
-@@ -78,6 +79,8 @@ tasks.jar {
+@@ -69,6 +70,8 @@ tasks.jar {
             "Specification-Version" to project.version,
             "Specification-Vendor" to "Bukkit Team",
             "Multi-Release" to "true", // Paper
--- a/patches/server/0796-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0796-Use-Velocity-compression-and-cipher-natives.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives


 diff --git a/build.gradle.kts b/build.gradle.kts
-index e789d52955cf9f353cf52af3a5a69bb7b54085bd..e067c69fea1dec79ef8e97cad1c74020b6a3a235 100644
+index 35266258f7eddba51a6e2b334046954213d88237..86e61491936d1b6821bd3776cd95fecf05a9b1b9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -55,6 +55,7 @@ dependencies {
+@@ -46,6 +46,7 @@ dependencies {
     implementation("io.netty:netty-all:4.1.65.Final") // Paper
 
     implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
--- a/patches/server/0846-Update-Log4J.patch
+++ b/patches/server/0846-Update-Log4J.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Update Log4J


 diff --git a/build.gradle.kts b/build.gradle.kts
-index e067c69fea1dec79ef8e97cad1c74020b6a3a235..612c4ed60406a69832609a9bdb3e45a7f3de6b74 100644
+index 86e61491936d1b6821bd3776cd95fecf05a9b1b9..c236fe5dc388f8bc0a929f1de04af94c63514208 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -33,11 +33,12 @@ dependencies {
+@@ -24,11 +24,12 @@ dependencies {
           all its classes to check if they are plugins.
           Scanning takes about 1-2 seconds so adding this speeds up the server start.
      */
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@ -1,9 +1,5 @@
 version = "1.0.0-SNAPSHOT"

-repositories {
-    maven("https://libraries.minecraft.net")
-}
-
 dependencies {
    compileOnly(project(":Paper-API"))
    compileOnly(project(":Paper-MojangAPI"))