update paper and paperweight

PaperMC · Dec 20, 2024 · 02b90ef · 02b90ef
1 parent 1e81199
commit 02b90ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git 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
@@ -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
+0 −7		buildSrc/src/main/kotlin/config-kotlin.gradle.kts
+0 −6		buildSrc/src/main/kotlin/config-publish.gradle.kts
+3 −5		gradle/libs.versions.toml
+3 −1		paperweight-core/build.gradle.kts
+11 −5		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt
+0 −1		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/extension/PaperweightCoreExtension.kt
+15 −11		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/BundlerJarTasks.kt
+0 −2		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/DevBundleTasks.kt
+2 −2		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt
+19 −18		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/ServerPatchingTasks.kt
+16 −9		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt
+0 −6		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SpigotTasks.kt
+0 −1		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/FilterRepo.kt
+0 −1		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/ForkSetup.kt
+1 −6		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupVanilla.kt
+1 −1		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplyFilePatches.kt
+1 −1		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplyFilePatchesFuzzy.kt
+5 −3		paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplySingleFilePatches.kt
+12 −12		paperweight-core/src/test/kotlin/io/papermc/paperweight/FunctionalTest.kt
+2 −1		paperweight-core/src/test/kotlin/io/papermc/paperweight/core/tasks/ApplyFilePatchesTest.kt
+0 −0		paperweight-core/src/test/resources/apply_patches/input/base/Test.java
+0 −0		paperweight-core/src/test/resources/apply_patches/input/patches/Test.java.patch
+0 −0		paperweight-core/src/test/resources/apply_patches/output/source/Test.java
+15 −4		paperweight-lib/build.gradle.kts
+3 −2		paperweight-lib/src/main/kotlin-templates/io/papermc/paperweight/util/LibraryVersions.kt.peb
+0 −11		paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/GenerateDevBundle.kt
+0 −1		paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/RemapJar.kt
+0 −143		paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/RemapSpigotAt.kt
+1 −4		paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplySourceATs.kt
+2 −0		paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt
+1 −1		paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/git.kt
+16 −0		paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/project-util.kt
+22 −11		paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt
+1 −1		paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/SetupHandler.kt
+2 −2		paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/SetupHandlerImpl.kt
+1 −1		paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/UserdevSetup.kt