From b3f2c79d028f330e6364de4c14a5761a96df9e46 Mon Sep 17 00:00:00 2001
From: Lexi Larkin <lexi@qixils.dev>
Date: Sat, 1 Jul 2023 15:16:43 -0400
Subject: [PATCH] feat: shade eden-interfaces

---
 build.gradle.kts                        |  3 ++-
 gradle.properties                       |  1 +
 patches/server/0001-Build-changes.patch | 23 ++++++++++++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8c02918..4d23673 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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")
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 348a84d..b94a079 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index e668217..0e1e0a2 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -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) {