diff --git a/patches/api/0001-Rebrand.patch b/patches/api/0001-Rebrand.patch
index 43b3773..1f44731 100644
--- a/patches/api/0001-Rebrand.patch
+++ b/patches/api/0001-Rebrand.patch
@@ -5,19 +5,18 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6aef83558a5ef7e84873b127c3bb43a6468c9a24..ce7417105888f2b5b6b585cecb13aaa22fb700c2 100644
+index 6aef83558a5ef7e84873b127c3bb43a6468c9a24..36b221014b99327afa2abda5d232659cfa922839 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -141,6 +141,13 @@ tasks.jar {
+@@ -141,6 +141,12 @@ tasks.jar {
      }
  }
  
-+// Pufferfish Start
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
++tasks.compileJava {
++    options.compilerArgs.add("--add-modules=jdk.incubator.vector")
++    options.compilerArgs.add("-Xlint:-deprecation")
++    options.isWarnings = false
 +}
-+// Pufferfish End
 +
  tasks.withType<Javadoc> {
      (options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
diff --git a/patches/server/0001-Fix-build-and-Rebrand.patch b/patches/server/0001-Fix-build-and-Rebrand.patch
index f1c32b4..6d45af2 100644
--- a/patches/server/0001-Fix-build-and-Rebrand.patch
+++ b/patches/server/0001-Fix-build-and-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix build and Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d67acf49205e6df94e3d65de624f2ddc6c34a44b..052bfd0b79bf6e1282a563950505df81f6333eb8 100644
+index d67acf49205e6df94e3d65de624f2ddc6c34a44b..1342aefe5a298a373ab2cd00bf42356c6cf24c08 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -4,6 +4,8 @@ import java.time.Instant
@@ -26,7 +26,7 @@ index d67acf49205e6df94e3d65de624f2ddc6c34a44b..052bfd0b79bf6e1282a563950505df81
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -72,7 +74,22 @@ dependencies {
+@@ -72,6 +74,20 @@ dependencies {
      implementation("io.papermc:reflection-rewriter-runtime:$reflectionRewriterVersion")
      implementation("io.papermc:reflection-rewriter-proxy-generator:$reflectionRewriterVersion")
      // Paper end - Remap reflection
@@ -40,16 +40,14 @@ index d67acf49205e6df94e3d65de624f2ddc6c34a44b..052bfd0b79bf6e1282a563950505df81
 +    // Vine end
 +}
 +
-+// Pufferfish Start
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
++tasks.compileJava {
++    options.compilerArgs.add("--add-modules=jdk.incubator.vector")
++    options.compilerArgs.add("-Xlint:-deprecation")
++    options.isWarnings = false
  }
-+// Pufferfish End
  
  paperweight {
-     craftBukkitPackageVersion.set("v1_20_R4") // also needs to be updated in MappingEnvironment
-@@ -91,14 +108,14 @@ tasks.jar {
+@@ -91,14 +107,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",