Skip to content

Commit

Permalink
update paper
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpenilla
jpenilla committed Dec 18, 2024
1 parent 3a20c68 commit ecb567e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build-data/fork.at
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file is auto generated, any changes may be overridden!
# See CONTRIBUTING.md on how to add access transformers.
public net.minecraft.world.entity.Interaction getResponse()Z
public net.minecraft.data.registries.TradeRebalanceRegistries BUILDER
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

paperweight {
upstreams.paper {
ref = "e6559c553365946353881a7765b478930ce4b583"
ref = "c55ad7092c017818459fc60b7b07d247cef05353"

patchFile {
path = "paper-server/build.gradle.kts"
Expand Down
2 changes: 1 addition & 1 deletion paperweight
Submodule paperweight updated 54 files
+3 −2 gradle/libs.versions.toml
+0 −37 paperweight-core/build.gradle.kts
+23 −1 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
+1 −11 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt
+19 −11 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/ServerPatchingTasks.kt
+24 −19 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt
+2 −12 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/UpstreamConfigTasks.kt
+0 −66 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/CopyAndTag.kt
+2 −40 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/FilterRepo.kt
+19 −51 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/ForkSetup.kt
+4 −1 paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplySingleFilePatches.kt
+2 −5 paperweight-core/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt
+2 −2 paperweight-core/src/test/kotlin/io/papermc/paperweight/FunctionalTest.kt
+2 −2 paperweight-core/src/test/resources/fake_mojang/server/Test.java
+2 −2 paperweight-core/src/test/resources/functional_test/build-data/expected.at
+1 −1 paperweight-core/src/test/resources/functional_test/build-data/fake.at
+1 −1 paperweight-core/src/test/resources/functional_test/build-data/paper.at
+2 −2 paperweight-core/src/test/resources/functional_test/fake-patches/expected/0001-Feature.patch
+2 −2 paperweight-core/src/test/resources/functional_test/fake-patches/expected/Test.java.patch
+1 −1 paperweight-core/src/test/resources/functional_test/fake-patches/features/0001-Feature.patch
+2 −2 paperweight-core/src/test/resources/functional_test/fake-patches/sources/Test.java.patch
+0 −15 ...ht-core/src/test/resources/functional_test/test-server/patches/sources/net/minecraft/CrashReport.java.patch
+11 −0 ...core/src/test/resources/functional_test/test-server/patches/sources/net/minecraft/core/Rotations.java.patch
+5 −35 paperweight-lib/build.gradle.kts
+3 −3 paperweight-lib/src/main/kotlin-templates/io/papermc/paperweight/util/JSTVersion.kt.peb
+0 −0 paperweight-lib/src/main/kotlin/io/papermc/paperweight/PaperweightException.kt
+43 −31 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/CreateBundlerJar.kt
+56 −116 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/GenerateDevBundle.kt
+1 −1 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/DecompileJar.kt
+1 −1 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/RemapJar.kt
+37 −66 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/SetupVanilla.kt
+0 −83 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplySourceAT.kt
+91 −0 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplySourceATs.kt
+7 −2 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/FixupFilePatches.kt
+235 −0 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ImportLibraryFiles.kt
+113 −36 paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/RebuildFilePatches.kt
+0 −268 paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/McDev.kt
+33 −6 paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/at.kt
+1 −2 paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt
+61 −0 paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/file.kt
+89 −0 paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/nio.kt
+28 −9 paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/utils.kt
+0 −86 paperweight-lib/src/restamp/kotlin/io/papermc/paperweight/restamp/ApplySourceATWorker.kt
+0 −165 paperweight-lib/src/restamp/kotlin/io/papermc/paperweight/restamp/RebuildFilePatchesRestampWorker.kt
+0 −79 paperweight-lib/src/restamp/kotlin/io/papermc/paperweight/restamp/RestampWorker.kt
+0 −72 paperweight-lib/src/restamp/kotlin/io/papermc/paperweight/restamp/restamp-utils.kt
+0 −73 paperweight-lib/src/shared/kotlin/io/papermc/paperweight/util/shared-file.kt
+0 −39 paperweight-lib/src/shared/kotlin/io/papermc/paperweight/util/shared-utils.kt
+10 −8 paperweight-lib/src/test/kotlin/io/papermc/paperweight/tasks/TaskTest.kt
+2 −11 paperweight-lib/src/test/kotlin/io/papermc/paperweight/tasks/softspoon/ApplySourceATTest.kt
+0 −1 paperweight-lib/src/test/kotlin/io/papermc/paperweight/util/ATTest.kt
+0 −1 paperweight-userdev/build.gradle.kts
+3 −3 ...rweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/step/MinecraftSourcesMache.kt

0 comments on commit ecb567e

Please sign in to comment.