From dad12b324b89ba850d0fe2c05bbecac34ffbbc60 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Fri, 18 Jun 2021 00:25:16 -0500 Subject: [PATCH] Move package version to server project --- gradle.properties | 1 - patches/server/0001-Setup-Gradle-project.patch | 7 +++---- patches/server/0003-Build-system-changes.patch | 9 +++++---- ...erminalConsoleAppender-for-console-improvements.patch | 4 ++-- ...andle-plugin-prefixes-using-Log4J-configuration.patch | 4 ++-- .../server/0224-Use-asynchronous-Log4j-2-loggers.patch | 4 ++-- patches/server/0425-Implement-Brigadier-Mojang-API.patch | 4 ++-- patches/server/0431-Implement-Mob-Goal-API.patch | 4 ++-- ...0626-Add-support-for-hex-color-codes-in-console.patch | 4 ++-- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/gradle.properties b/gradle.properties index 623b006fac..0fec65e48e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ group = io.papermc.paper version = 1.17-R0.1-SNAPSHOT mcVersion = 1.17 -packageVersion = 1_17_R1 org.gradle.parallel=true org.gradle.vfs.watch=false diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 9f3bc56dc2..cb54f9ad40 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -20,10 +20,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a /.project diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..fada7057dcb81c3206bdb0ca1730c3df2420ae3e +index 0000000000000000000000000000000000000000..596b4f52bc57eca8cc7a0138a1e36d71c1d73ca6 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,135 @@ +@@ -0,0 +1,134 @@ +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import io.papermc.paperweight.util.Git @@ -39,8 +39,6 @@ index 0000000000000000000000000000000000000000..fada7057dcb81c3206bdb0ca1730c3df + id("com.github.johnrengelman.shadow") +} + -+val packageVersion = providers.gradleProperty("packageVersion").forUseAtConfigurationTime().get() -+ +repositories { + maven("https://libraries.minecraft.net/") +} @@ -101,6 +99,7 @@ index 0000000000000000000000000000000000000000..fada7057dcb81c3206bdb0ca1730c3df +tasks.shadowJar { + archiveClassifier.set("mojang-mapped") + ++ val packageVersion = "1_17_R1" + relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { + exclude("org.bukkit.craftbukkit.Main*") + } diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 0e7ca16999..97581518a4 100644 --- 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 fada7057dcb81c3206bdb0ca1730c3df2420ae3e..ba7087874f781a0de57e5a637da4c69c6aea5943 100644 +index 596b4f52bc57eca8cc7a0138a1e36d71c1d73ca6..74bde15e021f306a2f1247678f92becbdce313b8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -22,21 +22,23 @@ repositories { +@@ -20,21 +20,23 @@ repositories { dependencies { implementation(project(":Paper-API")) implementation("jline:jline:2.12.1") @@ -36,7 +36,7 @@ index fada7057dcb81c3206bdb0ca1730c3df2420ae3e..ba7087874f781a0de57e5a637da4c69c testImplementation("junit:junit:4.13.1") testImplementation("org.hamcrest:hamcrest-library:1.3") } -@@ -55,6 +57,7 @@ tasks.jar { +@@ -53,6 +55,7 @@ tasks.jar { "Specification-Title" to "Bukkit", "Specification-Version" to project.version, "Specification-Vendor" to "Bukkit Team", @@ -44,7 +44,7 @@ index fada7057dcb81c3206bdb0ca1730c3df2420ae3e..ba7087874f781a0de57e5a637da4c69c ) for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) -@@ -72,14 +75,22 @@ publishing { +@@ -70,15 +73,23 @@ publishing { } } @@ -59,6 +59,7 @@ index fada7057dcb81c3206bdb0ca1730c3df2420ae3e..ba7087874f781a0de57e5a637da4c69c + rename { "pom.xml" } + } + + val packageVersion = "1_17_R1" relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { exclude("org.bukkit.craftbukkit.Main*") } diff --git a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch index 04c741e50a..1877cd1f77 100644 --- 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 f3b51015bcd765e2035e9071fab273903b48abdf..54788e7812f39349aa7b8005feb79d99a59ad95a 100644 +index 74bde15e021f306a2f1247678f92becbdce313b8..168728c96f8a8aaf5912f4d70cb5939daeb9cb27 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -21,7 +21,17 @@ repositories { +@@ -19,7 +19,17 @@ repositories { dependencies { implementation(project(":Paper-API")) diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch index ed51cc1274..54b7aaa5b1 100644 --- 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 a85b1922391bd9aa121a3654f0095c9523e7fbd7..55915452beff1f8b6b9a44cf2a6d208dda6c3d8d 100644 +index 168728c96f8a8aaf5912f4d70cb5939daeb9cb27..8967d19c1ffa3b6cc38b53cbbc1341fe0ed4c60b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -30,7 +30,7 @@ dependencies { +@@ -28,7 +28,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. */ diff --git a/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch index 3dcef5220b..5a3418676b 100644 --- a/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch +++ b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/build.gradle.kts b/build.gradle.kts -index 864fab686595f0efe3ff8b097339bcaff95fcc48..5c92ed82d1527d1631fdb4917cd0e0d56f907a96 100644 +index 8967d19c1ffa3b6cc38b53cbbc1341fe0ed4c60b..f66a20f09f86f754d020d8f1cd2d57f47003fe85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -41,6 +41,7 @@ dependencies { +@@ -39,6 +39,7 @@ dependencies { } runtimeOnly("org.xerial:sqlite-jdbc:3.34.0") runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper diff --git a/patches/server/0425-Implement-Brigadier-Mojang-API.patch b/patches/server/0425-Implement-Brigadier-Mojang-API.patch index 47f752302f..b54bd4ef1b 100644 --- a/patches/server/0425-Implement-Brigadier-Mojang-API.patch +++ b/patches/server/0425-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 ff26c51fe2a04bd8a18a9c4ee9ca004f32fae4ab..c4aac1360a7fce1ae95fa52ecb8a861a1c196edb 100644 +index f66a20f09f86f754d020d8f1cd2d57f47003fe85..2d738d1c3c8da84bc9b1b88fd5d2fedc89f04fbf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -21,6 +21,7 @@ repositories { +@@ -19,6 +19,7 @@ repositories { dependencies { implementation(project(":Paper-API")) diff --git a/patches/server/0431-Implement-Mob-Goal-API.patch b/patches/server/0431-Implement-Mob-Goal-API.patch index 1358e43080..1888e8d510 100644 --- a/patches/server/0431-Implement-Mob-Goal-API.patch +++ b/patches/server/0431-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 f42b0889a4ea1a7b2413c0f5399f043d7f243633..76e93c6a46286b8c035315f31828e0d2db9504f7 100644 +index 2d738d1c3c8da84bc9b1b88fd5d2fedc89f04fbf..ecd2a9cd422e67d5aeebf9abf2998452515fad80 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -51,6 +51,7 @@ dependencies { +@@ -49,6 +49,7 @@ dependencies { implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper implementation("io.netty:netty-all:4.1.65.Final") // Paper diff --git a/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch index 70744e4d24..62b6e41761 100644 --- a/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch +++ b/patches/server/0626-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 f83c5c672d7728946d4c4aef6c496a73da41fc61..e5fd2f5ca371e6a93b0860b3758d5be68a9871e5 100644 +index ecd2a9cd422e67d5aeebf9abf2998452515fad80..03521590dfcbb09416097e793fae5951c1ae3cc0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -32,6 +32,7 @@ dependencies { +@@ -30,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