feat: shade eden-interfaces

This commit is contained in:
Lexi Larkin
2023-07-01 15:16:43 -04:00
parent 86a21a089b
commit b3f2c79d02
3 changed files with 19 additions and 8 deletions

View File

@@ -1,4 +1,5 @@
import io.papermc.paperweight.util.constants.*
val edenVersion: String by project
plugins {
java
@@ -50,7 +51,7 @@ subprojects {
}
dependencies {
implementation("gg.projecteden:eden-interfaces:2.2.8-SNAPSHOT")
implementation("gg.projecteden:eden-interfaces:$edenVersion")
}
}

View File

@@ -3,6 +3,7 @@ version = 1.20.1-R0.1-SNAPSHOT
mcVersion = 1.20.1
paperRef = fead63e2eac3e11c900e68d468d51eb5ef091059
edenVersion = 2.2.8-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=true

View File

@@ -5,21 +5,30 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b0e7b5e80deaae3adb903a0e3309856861a91fa0 100644
index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..38a776edb7d5dff4076925cca0ec34621b42c0d3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
@@ -1,4 +1,5 @@
import io.papermc.paperweight.util.*
+val edenVersion: String by project // Parchment
plugins {
java
@@ -7,8 +8,11 @@ plugins {
}
dependencies {
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation(project(":parchment-api")) // Parchment
+ implementation("io.papermc.paper:paper-mojangapi:${project.version}") // Parchment
+ // Parchment start
+ implementation(project(":parchment-api"))
+ implementation("io.papermc.paper:paper-mojangapi:${project.version}")
+ vanillaServer("gg.projecteden:eden-interfaces:$edenVersion")
+ // Parchment end
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -64,7 +64,7 @@ tasks.jar {
@@ -64,7 +68,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -28,7 +37,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b0e7b5e80deaae3adb903a0e33098568
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -81,7 +81,27 @@ tasks.jar {
@@ -81,7 +85,27 @@ tasks.jar {
publishing {
publications.create<MavenPublication>("maven") {
@@ -57,7 +66,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b0e7b5e80deaae3adb903a0e33098568
}
}
@@ -136,7 +156,7 @@ fun TaskContainer.registerRunTask(
@@ -136,7 +160,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {