everything works again!

This commit is contained in:
Ben Kerllenevich
2021-06-13 06:58:48 -04:00
parent ef7f70f6f2
commit 345abf2b7d
6 changed files with 30 additions and 31 deletions

View File

@@ -1,12 +1,12 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <me@notom3ga.me>
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<JavaExec> =
register<JavaExec>(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