Skip to content

Commit

Permalink
Update minecraft dir references
Browse files Browse the repository at this point in the history
  • Loading branch information
kennytv committed Dec 22, 2024
1 parent 90d50aa commit 8ad15d6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ Assuming you have already forked the repository:
2. Type `./gradlew applyPatches` in a terminal to apply the changes from upstream.
On Windows, replace the `./` with `.\` at the beginning for all `gradlew` commands;
3. cd into `paper-server` for server changes, and `paper-api` for API changes.
**Only changes made in `paper-server/src/vanilla` have to deal with the patch system.**
**Only changes made in `paper-server/src/minecraft` have to deal with the patch system.**

`paper-server/src/vanilla` is not a git repositories in the traditional sense. Its
initial commits are the decompiled and deobfuscated Vanilla source files. The per-file
`paper-server/src/minecraft` is not a git repositories in the traditional sense. Its
initial commits are the decompiled and deobfuscated Minecraft source files. The per-file
patches are applied on top of these files as a single, large commit, which is then followed
by the individual feature-patch commits.

### Modifying (per-file) Vanilla patches
### Modifying (per-file) Minecraft patches

This is generally what you need to do when editing Vanilla files. Updating our
This is generally what you need to do when editing Minecraft files. Updating our
per-file patches is as easy as making your changes and then running
# TODO
in the root directory. If nothing went wrong, you can rebuild patches with
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ tasks.register("checkWork") {

val input = providers.fileContents(layout.projectDirectory.file("$CACHE_PATH/last-updating-folder")).asText.map { it.trim() }
val patchFolder = layout.projectDirectory.dir("paper-server/patches/sources").dir(input)
val sourceFolder = layout.projectDirectory.dir("paper-server/src/vanilla/java").dir(input)
val sourceFolder = layout.projectDirectory.dir("paper-server/src/minecraft/java").dir(input)
val targetFolder = providers.gradleProperty("cleanPaperRepo").map {
expandUserHome(it).resolve(input.get())
}
Expand Down

0 comments on commit 8ad15d6

Please sign in to comment.