Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paperr@41263d9 [ci skip] Update paperweight to 1.3.4
PaperMC/Paperr@3109dd8 Updated Upstream (Bukkit/CraftBukkit) (#7428)
PaperMC/Paperr@17eb884 Use a CHM for StructureTemplate.Pallete cache
PaperMC/Paperr@f79c0da Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paperr@2121aed Rebuild patches

Pufferfish Changes:
pufferfish-gg/Pufferfishr@9aa81a5 Update Upstream (Paper)
pufferfish-gg/Pufferfishr@809bd9f Update Upstream (Paper)
pufferfish-gg/Pufferfishr@f053fd3 Update Upstream (Paper)
pufferfish-gg/Pufferfishr@5bf8730 Update Upstream (Paper)
pufferfish-gg/Pufferfishr@c4a780f Update Upstream (Paper)
pufferfish-gg/Pufferfishr@99a590b Fix lightning
pufferfish-gg/Pufferfishr@3e75ff0 Updated Upstream (Paper)
pufferfish-gg/Pufferfishr@110966e Updated Upstream (Paper)
pufferfish-gg/Pufferfishr@b6b58c4 Update Upstream (Paper misc-perf branch)
This commit is contained in:
BillyGalbreath
2022-02-01 07:49:14 -06:00
parent cef3815b3d
commit a21f907ced
30 changed files with 142 additions and 141 deletions

View File

@@ -4,7 +4,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.3"
id("io.papermc.paperweight.patcher") version "1.3.4"
}
repositories {
@@ -17,7 +17,7 @@ repositories {
}
dependencies {
remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
remapper("net.fabricmc:tiny-remapper:0.8.1:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.22")
paperclip("io.papermc:paperclip:3.0.2")
}
@@ -67,6 +67,7 @@ paperweight {
decompileRepo.set("https://files.minecraftforge.net/maven/")
usePaperUpstream(providers.gradleProperty("paperCommit")) {
url.set(github("pufferfish-gg", "Paper"))
withPaperPatcher {
apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
apiOutputDir.set(layout.projectDirectory.dir("Purpur-API"))