From 8ad15d64f00ecf1f11be4cbd715c229daa0209de Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 22 Dec 2024 11:45:15 +0100 Subject: [PATCH] Update minecraft dir references --- CONTRIBUTING.md | 10 +++++----- build.gradle.kts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74421624b1..d793b54e6a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/build.gradle.kts b/build.gradle.kts index 75fc6a21af..03fd12ce48 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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()) }