Replace third party repos with Paper repo (#7733)

we now mirror Fabric, Forge, and Mojang
This commit is contained in:
Jason 2022-04-13 19:58:48 -07:00 committed by GitHub
parent d4a712d957
commit a9f252e56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 32 additions and 57 deletions

View File

@ -8,11 +8,6 @@ java {
withJavadocJar() withJavadocJar()
} }
repositories {
mavenCentral()
maven("https://libraries.minecraft.net")
}
dependencies { dependencies {
implementation(project(":paper-api")) implementation(project(":paper-api"))
api("com.mojang:brigadier:1.0.18") api("com.mojang:brigadier:1.0.18")

View File

@ -19,6 +19,8 @@ allprojects {
} }
} }
val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"
subprojects { subprojects {
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {
options.encoding = Charsets.UTF_8.name() options.encoding = Charsets.UTF_8.name()
@ -38,13 +40,9 @@ subprojects {
} }
} }
if (name == "Paper-MojangAPI") {
return@subprojects
}
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://papermc.io/repo/repository/maven-public/") maven(paperMavenPublicUrl)
} }
} }
@ -52,7 +50,7 @@ val spigotDecompiler: Configuration by configurations.creating
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://papermc.io/repo/repository/maven-public/") { maven(paperMavenPublicUrl) {
content { content {
onlyForConfigurations( onlyForConfigurations(
configurations.paperclip.name, configurations.paperclip.name,
@ -74,9 +72,9 @@ paperweight {
minecraftVersion.set(providers.gradleProperty("mcVersion")) minecraftVersion.set(providers.gradleProperty("mcVersion"))
serverProject.set(project(":paper-server")) serverProject.set(project(":paper-server"))
paramMappingsRepo.set("https://maven.fabricmc.net/") paramMappingsRepo.set(paperMavenPublicUrl)
remapRepo.set("https://maven.fabricmc.net/") remapRepo.set(paperMavenPublicUrl)
decompileRepo.set("https://files.minecraftforge.net/maven/") decompileRepo.set(paperMavenPublicUrl)
craftBukkit { craftBukkit {
fernFlowerJar.set(layout.file(spigotDecompiler.elements.map { it.single().asFile })) fernFlowerJar.set(layout.file(spigotDecompiler.elements.map { it.single().asFile }))
@ -108,9 +106,7 @@ tasks.generateDevelopmentBundle {
mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
libraryRepositories.addAll( libraryRepositories.addAll(
"https://repo.maven.apache.org/maven2/", "https://repo.maven.apache.org/maven2/",
"https://libraries.minecraft.net/",
"https://papermc.io/repo/repository/maven-public/", "https://papermc.io/repo/repository/maven-public/",
"https://maven.fabricmc.net/",
) )
} }

View File

@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
+/.factorypath +/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..bc894c62618437215e1a7185dc20283e4f9963dd index 0000000000000000000000000000000000000000..75c858870a55f7282a0e3500f803cb330b462f37
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,141 @@ @@ -0,0 +1,137 @@
+import io.papermc.paperweight.util.* +import io.papermc.paperweight.util.*
+ +
+plugins { +plugins {
@ -40,10 +40,6 @@ index 0000000000000000000000000000000000000000..bc894c62618437215e1a7185dc20283e
+ id("com.github.johnrengelman.shadow") + id("com.github.johnrengelman.shadow")
+} +}
+ +
+repositories {
+ maven("https://libraries.minecraft.net/")
+}
+
+dependencies { +dependencies {
+ implementation(project(":paper-api")) + implementation(project(":paper-api"))
+ implementation("jline:jline:2.12.1") + implementation("jline:jline:2.12.1")

View File

@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index bc894c62618437215e1a7185dc20283e4f9963dd..f08a6a00ad4d4c96166b386b3e79dc1ea021db3a 100644 index 75c858870a55f7282a0e3500f803cb330b462f37..d39ed9a8a32913193aec1bba2a59a352b8032dae 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -13,10 +13,9 @@ repositories { @@ -9,10 +9,9 @@ plugins {
dependencies { dependencies {
implementation(project(":paper-api")) implementation(project(":paper-api"))
implementation("jline:jline:2.12.1") implementation("jline:jline:2.12.1")
@ -21,7 +21,7 @@ index bc894c62618437215e1a7185dc20283e4f9963dd..f08a6a00ad4d4c96166b386b3e79dc1e
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
runtimeOnly("mysql:mysql-connector-java:8.0.27") runtimeOnly("mysql:mysql-connector-java:8.0.27")
@@ -36,6 +35,7 @@ tasks.jar { @@ -32,6 +31,7 @@ tasks.jar {
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@ -29,7 +29,7 @@ index bc894c62618437215e1a7185dc20283e4f9963dd..f08a6a00ad4d4c96166b386b3e79dc1e
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
@@ -44,6 +44,8 @@ tasks.jar { @@ -40,6 +40,8 @@ tasks.jar {
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
"Specification-Vendor" to "Bukkit Team", "Specification-Vendor" to "Bukkit Team",
@ -39,7 +39,7 @@ index bc894c62618437215e1a7185dc20283e4f9963dd..f08a6a00ad4d4c96166b386b3e79dc1e
for (tld in setOf("net", "com", "org")) { for (tld in setOf("net", "com", "org")) {
attributes("$tld/bukkit", "Sealed" to true) attributes("$tld/bukkit", "Sealed" to true)
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e1963817af4d73c569da068b74ebbb260c5183cc..d20bb61700ba231cc5b58295f2a819ff7e7db705 100644 index 2c90c116d87e060b6da4a8ce79f839fff80db86d..e75ff70c52b097af447b7a91ef2c20c08a904d92 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -190,7 +190,7 @@ public class Main { @@ -190,7 +190,7 @@ public class Main {

View File

@ -19,10 +19,10 @@ Other changes:
configuration configuration
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index f08a6a00ad4d4c96166b386b3e79dc1ea021db3a..6c86bb7ff8c7bfcfc29fe79ea8c6f79656a3d7ae 100644 index d39ed9a8a32913193aec1bba2a59a352b8032dae..dccb73a4e1bc38cd64bb0a654cb92117aa76692a 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -12,7 +12,17 @@ repositories { @@ -8,7 +8,17 @@ plugins {
dependencies { dependencies {
implementation(project(":paper-api")) implementation(project(":paper-api"))

View File

@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing
the plugin logger. the plugin logger.
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 6c86bb7ff8c7bfcfc29fe79ea8c6f79656a3d7ae..5b009dc1b35e551ed78baf86b49d6470c4598a12 100644 index dccb73a4e1bc38cd64bb0a654cb92117aa76692a..ef1359ed87282dc9aab7ea49afcc1f0db345018d 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies { @@ -17,7 +17,7 @@ dependencies {
all its classes to check if they are plugins. all its classes to check if they are plugins.
Scanning takes about 1-2 seconds so adding this speeds up the server start. Scanning takes about 1-2 seconds so adding this speeds up the server start.
*/ */

View File

@ -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 diff --git a/build.gradle.kts b/build.gradle.kts
index 5b009dc1b35e551ed78baf86b49d6470c4598a12..ccaef92ae87bd1723957e98b3b632fb79b8eeb3d 100644 index ef1359ed87282dc9aab7ea49afcc1f0db345018d..ad1e2497f2740fb6e9c64e562a95bf064bea981f 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies { @@ -24,6 +24,7 @@ dependencies {
implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
runtimeOnly("mysql:mysql-connector-java:8.0.27") runtimeOnly("mysql:mysql-connector-java:8.0.27")

View File

@ -10,10 +10,10 @@ Adds CommandRegisteredEvent
- Allows manipulating the CommandNode to add more children/metadata for the client - Allows manipulating the CommandNode to add more children/metadata for the client
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index ccaef92ae87bd1723957e98b3b632fb79b8eeb3d..fd4b0c173be72516f22c6e5d540249e3079a7216 100644 index ad1e2497f2740fb6e9c64e562a95bf064bea981f..1d7bbff8711bfb991046ecc66dce328a5f643c2d 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -12,6 +12,7 @@ repositories { @@ -8,6 +8,7 @@ plugins {
dependencies { dependencies {
implementation(project(":paper-api")) implementation(project(":paper-api"))

View File

@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index fd4b0c173be72516f22c6e5d540249e3079a7216..cf6c265714d8241f52e83de59094d7ae2cd56884 100644 index 1d7bbff8711bfb991046ecc66dce328a5f643c2d..2ea3af07a18094d0bc7e4898c0bb97ecbedf88f3 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
@ -16,19 +16,7 @@ index fd4b0c173be72516f22c6e5d540249e3079a7216..cf6c265714d8241f52e83de59094d7ae
plugins { plugins {
java java
@@ -8,6 +10,11 @@ plugins { @@ -19,6 +21,7 @@ dependencies {
repositories {
maven("https://libraries.minecraft.net/")
+ // Paper start
+ maven("https://maven.fabricmc.net/") {
+ mavenContent { includeModule("net.fabricmc", "mapping-io") }
+ }
+ // Paper end
}
dependencies {
@@ -23,6 +30,7 @@ dependencies {
Scanning takes about 1-2 seconds so adding this speeds up the server start. 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 implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
@ -36,7 +24,7 @@ index fd4b0c173be72516f22c6e5d540249e3079a7216..cf6c265714d8241f52e83de59094d7ae
// Paper end // Paper end
implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
implementation("org.ow2.asm:asm:9.2") implementation("org.ow2.asm:asm:9.2")
@@ -35,6 +43,8 @@ dependencies { @@ -31,6 +34,8 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
@ -45,7 +33,7 @@ index fd4b0c173be72516f22c6e5d540249e3079a7216..cf6c265714d8241f52e83de59094d7ae
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
} }
@@ -92,6 +102,45 @@ tasks.shadowJar { @@ -88,6 +93,45 @@ tasks.shadowJar {
} }
} }

View File

@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index cf6c265714d8241f52e83de59094d7ae2cd56884..f83bed210b97508affd6523065b53f2876f964f0 100644 index 2ea3af07a18094d0bc7e4898c0bb97ecbedf88f3..93bfdaeaae9710e271b23f44076e21a5eff6b8ff 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -45,6 +45,7 @@ dependencies { @@ -36,6 +36,7 @@ dependencies {
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation

View File

@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index f83bed210b97508affd6523065b53f2876f964f0..a205db80a1a8dbe53130c4148b25163741c33406 100644 index 93bfdaeaae9710e271b23f44076e21a5eff6b8ff..bc90bb64877d423e67d917609521e6b33405c4e4 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -44,6 +44,11 @@ dependencies { @@ -35,6 +35,11 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation

View File

@ -5,10 +5,10 @@ Subject: [PATCH] Update Log4j
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index a205db80a1a8dbe53130c4148b25163741c33406..4beb35d1e5b013395f5df101e843f41c2ce174ad 100644 index bc90bb64877d423e67d917609521e6b33405c4e4..dd8f449dddbe0838835ae8f8d5033aa422db403d 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -29,10 +29,11 @@ dependencies { @@ -20,10 +20,11 @@ dependencies {
all its classes to check if they are plugins. all its classes to check if they are plugins.
Scanning takes about 1-2 seconds so adding this speeds up the server start. Scanning takes about 1-2 seconds so adding this speeds up the server start.
*/ */