From 02b90eff99e1e79b0cbf6a713f36eb0d14397993 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Fri, 20 Dec 2024 00:51:22 -0800
Subject: [PATCH] update paper and paperweight

---
 build.gradle.kts                   |  2 +-
 fork-server/build.gradle.kts.patch | 31 +-----------------------------
 paperweight                        |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7dea162..aa4ed5a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 paperweight {
     upstreams.paper {
-        ref = "dce53e05b876e23aac4a2635dfeaf856fac9af15"
+        ref = "6e0c8776e67219ddc8e4e61364c8203d924fd23f"
 
         patchFile {
             path = "paper-server/build.gradle.kts"
diff --git a/fork-server/build.gradle.kts.patch b/fork-server/build.gradle.kts.patch
index 1260bff..a4ee3ed 100644
--- a/fork-server/build.gradle.kts.patch
+++ b/fork-server/build.gradle.kts.patch
@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -21,25 +_,37 @@
+@@ -20,8 +_,19 @@
      // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
      // gitFilePatches = true
  
@@ -17,39 +17,10 @@
 +
      paper {
 -        reobfMappingsPatch = layout.projectDirectory.file("../build-data/reobf-mappings-patch.tiny")
--        reobfPackagesToFix.addAll(
--            "co.aikar.timings",
--            "com.destroystokyo.paper",
--            "com.mojang",
--            "io.papermc.paper",
--            "ca.spottedleaf",
--            "net.kyori.adventure.bossbar",
--            "net.minecraft",
--            "org.bukkit.craftbukkit",
--            "org.spigotmc",
--        )
 +        paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
      }
  
      spigot {
-         buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
-         packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
-     }
-+
-+    reobfPackagesToFix.addAll(
-+        "co.aikar.timings",
-+        "com.destroystokyo.paper",
-+        "com.mojang",
-+        "io.papermc.paper",
-+        "ca.spottedleaf",
-+        "net.kyori.adventure.bossbar",
-+        "net.minecraft",
-+        "org.bukkit.craftbukkit",
-+        "org.spigotmc",
-+    )
- }
- 
- tasks.generateDevelopmentBundle {
 @@ -104,7 +_,20 @@
      }
  }
diff --git a/paperweight b/paperweight
index 9e0cd46..1dc821a 160000
--- a/paperweight
+++ b/paperweight
@@ -1 +1 @@
-Subproject commit 9e0cd465b32bcd9569527b46bc5e73db5733baa6
+Subproject commit 1dc821a295e27845c9b666361993c666e741d600