update paper and paperweight

This commit is contained in:
Jason Penilla 2024-12-20 00:51:22 -08:00
parent 1e81199e6d
commit 02b90eff99
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
3 changed files with 3 additions and 32 deletions

View File

@ -8,7 +8,7 @@ plugins {
paperweight {
upstreams.paper {
ref = "dce53e05b876e23aac4a2635dfeaf856fac9af15"
ref = "6e0c8776e67219ddc8e4e61364c8203d924fd23f"
patchFile {
path = "paper-server/build.gradle.kts"

View File

@ -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 @@
}
}

@ -1 +1 @@
Subproject commit 9e0cd465b32bcd9569527b46bc5e73db5733baa6
Subproject commit 1dc821a295e27845c9b666361993c666e741d600