ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade paperweight with bundler jar updates

Browse source 
This allows creating paperclip jars pre-patch (only the reobf'd jar for
now).
This commit is contained in:
Kyle Wood 2021-11-26 00:08:46 -06:00 committed by MiniDigger | Martin
parent e8f01f89d2
commit e519a51f95
19 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Paper-MojangAPI/build.gradle.kts
View file

@ -1,5 +1,3 @@
import java.util.Locale
plugins {
`java-library`
`maven-publish`
@ -16,7 +14,7 @@ repositories {
}
dependencies {
implementation(project(":Paper-API"))
implementation(project(":paper-api"))
api("com.mojang:brigadier:1.0.18")
compileOnly("it.unimi.dsi:fastutil:8.2.2")
@ -29,7 +27,6 @@ dependencies {
configure<PublishingExtension> {
publications.create<MavenPublication>("maven") {
artifactId = project.name.toLowerCase(Locale.ENGLISH)
from(components["java"])
}
}

4
build.gradle.kts
View file

@ -49,12 +49,12 @@ dependencies {
paramMappings("net.fabricmc:yarn:1.18-pre8+build.4:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.22")
paperclip("io.papermc:paperclip:2.0.1")
paperclip("io.papermc:paperclip:3.0.0-SNAPSHOT")
}
paperweight {
minecraftVersion.set(providers.gradleProperty("mcVersion"))
serverProject.set(project(":Paper-Server"))
serverProject.set(project(":paper-server"))
paramMappingsRepo.set("https://maven.fabricmc.net/")
remapRepo.set("https://maven.fabricmc.net/")

9
patches/api/0001-Convert-project-to-Gradle.patch
View file

@ -27,12 +27,10 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..2ffdda3764d92227264dd4a1ef9bf473db88c3a8
index 0000000000000000000000000000000000000000..3ccff060bcb816520a27ec2f34adc977dd49ce1d
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,68 @@
+import java.util.Locale
+
@@ -0,0 +1,65 @@
+plugins {
+ `java-library`
+ `maven-publish`
@ -66,7 +64,6 @@ index 0000000000000000000000000000000000000000..2ffdda3764d92227264dd4a1ef9bf473
+
+configure<PublishingExtension> {
+ publications.create<MavenPublication>("maven") {
+ artifactId = project.name.toLowerCase(Locale.ENGLISH)
+ from(components["java"])
+ }
+}
@ -82,7 +79,7 @@ index 0000000000000000000000000000000000000000..2ffdda3764d92227264dd4a1ef9bf473
+
+tasks.jar {
+ from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
+ into("META-INF/maven/${project.group}/${project.name.toLowerCase(Locale.ENGLISH)}")
+ into("META-INF/maven/${project.group}/${project.name}")
+ }
+ manifest {
+ attributes(

6
patches/api/0002-Build-system-changes.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 2ffdda3764d92227264dd4a1ef9bf473db88c3a8..430fa84c1de3eae24f48f915031c1a0265ad7e43 100644
index 3ccff060bcb816520a27ec2f34adc977dd49ce1d..738b1c0540e5184eb6d7296107d458aa5be0bfd3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,15 +17,23 @@ dependencies {
@@ -15,15 +15,23 @@ dependencies {
api("com.google.code.gson:gson:2.8.8")
api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.28")
@ -33,7 +33,7 @@ index 2ffdda3764d92227264dd4a1ef9bf473db88c3a8..430fa84c1de3eae24f48f915031c1a02
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
testImplementation("org.ow2.asm:asm-tree:9.2")
@@ -62,7 +70,7 @@ tasks.withType<Javadoc> {
@@ -59,7 +67,7 @@ tasks.withType<Javadoc> {
(options as StandardJavadocDocletOptions).links(
"https://guava.dev/releases/31.0.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",

4
patches/api/0004-Add-FastUtil-to-Bukkit.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
Doesn't expose to plugins, just allows Paper-API to use it for optimization
diff --git a/build.gradle.kts b/build.gradle.kts
index 430fa84c1de3eae24f48f915031c1a0265ad7e43..0f34457a5f18df3ba99f1168b99442d59df65e7b 100644
index 738b1c0540e5184eb6d7296107d458aa5be0bfd3..1455ed17cd055ec97e0adbbd309edae4ac6d1204 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
@@ -16,6 +16,7 @@ dependencies {
api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.28")
api("com.googlecode.json-simple:json-simple:1.1.1") // Paper

10
patches/api/0008-Adventure.patch
View file

@ -7,10 +7,10 @@ Co-authored-by: zml <zml@stellardrift.ca>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
diff --git a/build.gradle.kts b/build.gradle.kts
index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f78b15635 100644
index 1455ed17cd055ec97e0adbbd309edae4ac6d1204..72005a85bb8e7b516e9d96a27daca1dc426de6f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,19 @@ java {
@@ -8,6 +8,19 @@ java {
withJavadocJar()
}
@ -30,7 +30,7 @@ index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f
dependencies {
// api dependencies are listed transitively to API consumers
api("commons-lang:commons-lang:2.6")
@@ -19,6 +32,11 @@ dependencies {
@@ -17,6 +30,11 @@ dependencies {
api("org.yaml:snakeyaml:1.28")
api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
api("it.unimi.dsi:fastutil:8.5.6")
@ -42,7 +42,7 @@ index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
@@ -68,10 +86,25 @@ tasks.jar {
@@ -65,10 +83,25 @@ tasks.jar {
}
tasks.withType<Javadoc> {
@ -4076,7 +4076,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..d5b39fb4fc16a342b5661e08df150685
/**
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index 8d14d81c078d29781591e0ce96ea80338565e42b..f82f085ab9069abce10c2339446ef0d0bec8888c 100644
index c6a8a37a933cfc5a5885602a8a70fdda8fb6aa10..61441e56da69ee8cb92a2b1239f5406425a8344d 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -26,6 +26,12 @@ import org.objectweb.asm.tree.ParameterNode;

4
patches/api/0026-Use-ASM-for-event-executors.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods.
diff --git a/build.gradle.kts b/build.gradle.kts
index 50cee5c955b1a57e18f202897efa807f78b15635..283e2aefa17fe38ab10073761db2b77ba0ae8b46 100644
index 72005a85bb8e7b516e9d96a27daca1dc426de6f3..af2f95b6c6a71b4919edb38e520292676c1cc25d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,9 @@ dependencies {
@@ -36,6 +36,9 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")

4
patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
View file

@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction.
diff --git a/build.gradle.kts b/build.gradle.kts
index 283e2aefa17fe38ab10073761db2b77ba0ae8b46..0446e0131198ecd6d6d1e381eec5bbab18031b62 100644
index af2f95b6c6a71b4919edb38e520292676c1cc25d..720ba2774196f24cca6c4d1b173f90f8151c8a5e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,6 +37,8 @@ dependencies {
@@ -35,6 +35,8 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-gson")
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")

8
patches/server/0001-Setup-Gradle-project.patch
View file

@ -28,12 +28,11 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..9778c18a2822b00d48134583de87ea281623427d
index 0000000000000000000000000000000000000000..e2d2a87d68e611276f743064c6aaf82272d36582
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,150 @@
@@ -0,0 +1,148 @@
+import io.papermc.paperweight.util.*
+import java.util.Locale
+
+plugins {
+ java
@ -46,7 +45,7 @@ index 0000000000000000000000000000000000000000..9778c18a2822b00d48134583de87ea28
+}
+
+dependencies {
+ implementation(project(":Paper-API"))
+ implementation(project(":paper-api"))
+ implementation("jline:jline:2.12.1")
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
@ -92,7 +91,6 @@ index 0000000000000000000000000000000000000000..9778c18a2822b00d48134583de87ea28
+
+publishing {
+ publications.create<MavenPublication>("maven") {
+ artifactId = rootProject.name.toLowerCase(Locale.ENGLISH)
+ artifact(tasks.reobfJar) {
+ classifier = null
+ }

10
patches/server/0003-Build-system-changes.patch
View file

@ -5,12 +5,12 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddce4e02def 100644
index e2d2a87d68e611276f743064c6aaf82272d36582..552edd36f892bc8d1a0333984987c6d41174d967 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,10 +14,9 @@ repositories {
@@ -13,10 +13,9 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation(project(":paper-api"))
implementation("jline:jline:2.12.1")
- implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
- exclude(group = "org.apache.logging.log4j", module = "log4j-api")
@ -21,7 +21,7 @@ index 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddc
implementation("com.googlecode.json-simple:json-simple:1.1.1") {
// This includes junit transitively for whatever reason
isTransitive = false
@@ -41,6 +40,7 @@ tasks.jar {
@@ -40,6 +39,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
@ -29,7 +29,7 @@ index 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddc
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -49,6 +49,8 @@ tasks.jar {
@@ -48,6 +48,8 @@ tasks.jar {
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
"Specification-Vendor" to "Bukkit Team",

6
patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch
View file

@ -19,13 +19,13 @@ Other changes:
configuration
diff --git a/build.gradle.kts b/build.gradle.kts
index 19d4a798427de2c78b62a92246d47607a050a11d..c8f39fae4527c4ff3256c687f3defbff7f87a68c 100644
index 552edd36f892bc8d1a0333984987c6d41174d967..04fd8dabc3cb234655e7bf8a61d0e5705335825f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,17 @@ repositories {
@@ -12,7 +12,17 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation(project(":paper-api"))
- implementation("jline:jline:2.12.1")
+ // Paper start
+ implementation("org.jline:jline-terminal-jansi:3.21.0")

4
patches/server/0156-Handle-plugin-prefixes-using-Log4J-configuration.patch
View file

@ -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 c8f39fae4527c4ff3256c687f3defbff7f87a68c..1c14144551f07cc61b6dbb2b70498b399442cebd 100644
index 04fd8dabc3cb234655e7bf8a61d0e5705335825f..03007dc18d52d951ea149d651fb7fd2c9d75f82e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,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.
*/

4
patches/server/0222-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
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
index 1c14144551f07cc61b6dbb2b70498b399442cebd..a2cef2a6f04ba58ba49ac08c9e22cf8003216c39 100644
index 03007dc18d52d951ea149d651fb7fd2c9d75f82e..6ffeea41aa7d9370f002043672b3438bd15ef8aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
@@ -32,6 +32,7 @@ dependencies {
}
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
runtimeOnly("mysql:mysql-connector-java:8.0.27")

8
patches/server/0305-Implement-Brigadier-Mojang-API.patch
View file

@ -10,14 +10,14 @@ 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 a2cef2a6f04ba58ba49ac08c9e22cf8003216c39..caf8a5d3797883b4dad64a9da6b566c92cf1c506 100644
index 6ffeea41aa7d9370f002043672b3438bd15ef8aa..a9a871bb5ca742a174576a23b5c46d8b4a6c0f2c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,6 +13,7 @@ repositories {
@@ -12,6 +12,7 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
+ implementation(project(":Paper-MojangAPI"))
implementation(project(":paper-api"))
+ implementation(project(":paper-mojangapi"))
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")

12
patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View file

@ -6,17 +6,17 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
index 988f35257391bfb6cbc94b24965559ee7ad2987a..2ee89cff805cf0f7d2fed277442ef74f411f1cd0 100644
index a9a871bb5ca742a174576a23b5c46d8b4a6c0f2c..75def32d9e359d3990b84cd381c2f5bf9e8bffba 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,6 @@
+import io.papermc.paperweight.tasks.BaseTask
import io.papermc.paperweight.util.*
+import java.nio.file.Files
import java.util.Locale
plugins {
@@ -9,6 +11,11 @@ plugins {
java
@@ -8,6 +10,11 @@ plugins {
repositories {
maven("https://libraries.minecraft.net/")
@ -28,7 +28,7 @@ index 988f35257391bfb6cbc94b24965559ee7ad2987a..2ee89cff805cf0f7d2fed277442ef74f
}
dependencies {
@@ -24,6 +31,7 @@ dependencies {
@@ -23,6 +30,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
@ -36,7 +36,7 @@ index 988f35257391bfb6cbc94b24965559ee7ad2987a..2ee89cff805cf0f7d2fed277442ef74f
// Paper end
implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
implementation("org.ow2.asm:asm:9.2")
@@ -40,6 +48,8 @@ dependencies {
@@ -39,6 +47,8 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
@ -45,7 +45,7 @@ index 988f35257391bfb6cbc94b24965559ee7ad2987a..2ee89cff805cf0f7d2fed277442ef74f
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -101,6 +111,45 @@ tasks.shadowJar {
@@ -99,6 +109,45 @@ tasks.shadowJar {
}
}

4
patches/server/0418-Implement-Mob-Goal-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts
index 99ab6194dbcea67875c6cdf3f29bb41fff4a39b9..4bf4127bb8845499a1a629e03b0c767f0eb43461 100644
index 75def32d9e359d3990b84cd381c2f5bf9e8bffba..fb712b3c75068741ca4f69cddcb6c4a7dc1e81ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,6 +50,7 @@ dependencies {
@@ -49,6 +49,7 @@ dependencies {
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation

0
patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-distance-maps.patch → patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
View file

10
patches/server/0778-Use-Velocity-compression-and-cipher-natives.patch
View file

@ -5,14 +5,18 @@ Subject: [PATCH] Use Velocity compression and cipher natives
diff --git a/build.gradle.kts b/build.gradle.kts
index 7d69f9e39361644796895254dfa518ef83d9e578..e572f524046d4799adec7f08b1609d82a64ab94f 100644
index fb712b3c75068741ca4f69cddcb6c4a7dc1e81ea..72e4828940396b7b326ed64c3c06b785f949b08d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,6 +49,7 @@ dependencies {
@@ -48,6 +48,11 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
+ implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
+ // Paper start - Use Velocity cipher
+ implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") {
+ isTransitive = false
+ }
+ // Paper end
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
testImplementation("junit:junit:4.13.1")

12
settings.gradle.kts
View file

@ -1,3 +1,5 @@
import java.util.Locale
pluginManagement {
repositories {
gradlePluginPortal()
@ -7,11 +9,11 @@ pluginManagement {
rootProject.name = "Paper"
include(
"Paper-API",
"Paper-Server",
"Paper-MojangAPI",
)
for (name in listOf("Paper-API", "Paper-Server", "Paper-MojangAPI")) {
val projName = name.toLowerCase(Locale.ENGLISH)
include(projName)
findProject(":$projName")!!.projectDir = file(name)
}
val testPlugin = file("test-plugin.settings.gradle.kts")
if (testPlugin.exists()) {