From 345abf2b7d03d33d4b3758c5737a163ac5a6c60c Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Sun, 13 Jun 2021 06:58:48 -0400 Subject: [PATCH] everything works again! --- Paper | 1 + build.gradle.kts | 18 ++++++++-- gradle.properties | 1 + patches/api/0001-Build-System-Changes.patch | 6 ++-- .../server/0001-Build-System-Changes.patch | 34 ++++++------------- settings.gradle.kts | 1 - 6 files changed, 30 insertions(+), 31 deletions(-) create mode 160000 Paper diff --git a/Paper b/Paper new file mode 160000 index 000000000..76a75fc35 --- /dev/null +++ b/Paper @@ -0,0 +1 @@ +Subproject commit 76a75fc35ad59bf0eab753a8c0f149376368cfaa diff --git a/build.gradle.kts b/build.gradle.kts index 4d0c18bfa..cb6970556 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,8 +21,8 @@ repositories { } dependencies { - remapper("org.quiltmc", "tiny-remapper", "0.4.1") - paperclip("io.papermc", "paperclip", "2.0.0-SNAPSHOT@jar") + remapper("org.quiltmc:tiny-remapper:0.4.1") + paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar") } subprojects { @@ -64,6 +64,18 @@ val initSubmodules by tasks.registering { paperweight { serverProject.set(project(":Purpur-Server")) + /* // this is the code for without submodules in case we ever want to use it + usePaperUpstream(providers.gradleProperty("paperRef")) { + withPaperPatcher { + apiPatchDir.set(layout.projectDirectory.dir("patches/api")) + apiOutputDir.set(layout.projectDirectory.dir("Purpur-API")) + + serverPatchDir.set(layout.projectDirectory.dir("patches/server")) + serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server")) + } + } + */ + upstreams { register("paper") { upstreamDataTask { @@ -86,4 +98,4 @@ paperweight { } } } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 64b9fd5f3..df4a3896c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ group = "net.pl3x.purpur" version = 1.17-R0.1-SNAPSHOT packageVersion = 1_17_R1 +paperRef = dev/1.17 diff --git a/patches/api/0001-Build-System-Changes.patch b/patches/api/0001-Build-System-Changes.patch index b131ea08a..0ba8130a0 100644 --- a/patches/api/0001-Build-System-Changes.patch +++ b/patches/api/0001-Build-System-Changes.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Build System Changes todo: merge with rebrand patch diff --git a/build.gradle.kts b/build.gradle.kts -index 9657dcb900267cb5cd1ad7a850eb15bc74479314..bd2fe95f862538ee0b8cf9dabf5f2e20961bb841 100644 +index 9633529a71556a453edae71b09a573a957d65c60..5f820411cf2eedbb59c727a7d019ea4cf026c69f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -25,6 +25,7 @@ dependencies { +@@ -27,6 +27,7 @@ dependencies { api("org.ow2.asm:asm:9.0") api("org.ow2.asm:asm-commons:9.0") api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper -+ api("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") // Purpur ++ api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") diff --git a/patches/server/0001-Build-System-Changes.patch b/patches/server/0001-Build-System-Changes.patch index 821137e9f..78f3f55d1 100644 --- a/patches/server/0001-Build-System-Changes.patch +++ b/patches/server/0001-Build-System-Changes.patch @@ -1,12 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich -Date: Sat, 12 Jun 2021 12:36:01 -0400 +Date: Sun, 13 Jun 2021 06:52:56 -0400 Subject: [PATCH] Build System Changes todo: merge with rebrand patch diff --git a/build.gradle.kts b/build.gradle.kts -index ac607a3be84bc02dedb95cab9a5eace40e33b511..6a576c6482b937d866cd6ed75d468e3a18d00786 100644 +index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..e36f89cb109fcc1d174e2c0efc104edb3007a6a8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ repositories { @@ -18,16 +18,15 @@ index ac607a3be84bc02dedb95cab9a5eace40e33b511..6a576c6482b937d866cd6ed75d468e3a // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -50,6 +50,8 @@ dependencies { +@@ -50,6 +50,7 @@ dependencies { + implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper implementation("io.netty:netty-all:4.1.65.Final") // Paper ++ implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur -+ implementation("cat.inspiracio", "rhino-js-engine", "1.7.7.1") // Purpur -+ testImplementation("junit:junit:4.13.1") testImplementation("org.hamcrest:hamcrest-library:1.3") - } -@@ -62,7 +64,7 @@ tasks.jar { +@@ -63,7 +64,7 @@ tasks.jar { attributes(mapOf( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -36,25 +35,12 @@ index ac607a3be84bc02dedb95cab9a5eace40e33b511..6a576c6482b937d866cd6ed75d468e3a "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -99,7 +101,7 @@ tasks.test { +@@ -98,7 +99,7 @@ tasks.test { fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider = register(name) { - group = "Paper" + group = "paperweight" // Purpur - workingDir = rootProject.projectDir.resolve("run") - doFirst { - if (!workingDir.exists()) workingDir.mkdir() -@@ -115,10 +117,12 @@ tasks.registerRunTask("runShadow") { - classpath(tasks.shadowJar.flatMap { it.archiveFile }) - } - -+/* // Purpur Start - reobfJar not found - tasks.registerRunTask("runReobf") { - description = "Spin up a test server from the reobfJar output jar" - classpath(tasks.reobfJar.flatMap { it.outputJar }) - } -+ */ // Purpur End - - tasks.registerRunTask("runDev") { - description = "Spin up a non-shaded non-remapped test server" + workingDir = rootProject.layout.projectDirectory.dir( + providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") + ).get().asFile diff --git a/settings.gradle.kts b/settings.gradle.kts index 551ef89c2..146730d92 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,5 +6,4 @@ pluginManagement { } rootProject.name = "Purpur" - include("Purpur-API", "Purpur-Server")