From 19b899b280b7be84d773079834feb380fe46a2d1 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <ben@omega24.dev>
Date: Fri, 26 Nov 2021 06:56:52 -0500
Subject: [PATCH] rebase

---
 gradle.properties                           |  2 +-
 patches/api/0001-Build-System-Changes.patch |  4 ++--
 patches/server/0002-Rebrand.patch           | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c0728bf49..e2303c8ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18-pre8-R0.1-SNAPSHOT
 mcVersion = 1.18-pre8
 packageVersion = 1_18_R1
 
-paperCommit = b95168418247e093667f37429a5a25092904537f
+paperCommit = 4c2918206976b64b36e27285bd1035b49e12f44d
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0001-Build-System-Changes.patch b/patches/api/0001-Build-System-Changes.patch
index dba5317d3..0910d039d 100644
--- a/patches/api/0001-Build-System-Changes.patch
+++ b/patches/api/0001-Build-System-Changes.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0446e0131198ecd6d6d1e381eec5bbab18031b62..7d6cde4e703ad23f47471e8610ace396d7c22e31 100644
+index 720ba2774196f24cca6c4d1b173f90f8151c8a5e..c5d5bd6e4e074b9290a37c5a5c5957936ed346f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -39,6 +39,7 @@ dependencies {
+@@ -37,6 +37,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
      api("org.slf4j:slf4j-api:1.7.30") // Paper
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index 6456f033d..b549b4129 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -5,30 +5,30 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e572f524046d4799adec7f08b1609d82a64ab94f..19a16f6689c68854fa91978da71debea3472b87a 100644
+index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067d2672257 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,8 +19,8 @@ repositories {
+@@ -18,8 +18,8 @@ repositories {
  }
  
  dependencies {
--    implementation(project(":Paper-API"))
--    implementation(project(":Paper-MojangAPI"))
+-    implementation(project(":paper-api"))
+-    implementation(project(":paper-mojangapi"))
 +    implementation(project(":Purpur-API")) // Purpur
 +    implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Purpur
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -50,6 +50,8 @@ dependencies {
- 
-     implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
-     implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
+@@ -53,6 +53,8 @@ dependencies {
+         isTransitive = false
+     }
+     // Paper end
 +    implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
 +    implementation("dev.omega24:upnp4j:1.0") // Purpur
  
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
-@@ -68,7 +70,7 @@ tasks.jar {
+@@ -71,7 +73,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -37,7 +37,7 @@ index e572f524046d4799adec7f08b1609d82a64ab94f..19a16f6689c68854fa91978da71debea
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -160,7 +162,7 @@ fun TaskContainer.registerRunTask(
+@@ -162,7 +164,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {