Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patcher v2 #265

Merged
merged 44 commits into from
Dec 21, 2024
Merged

patcher v2 #265

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0326eb2
Initial commit for patcher v2
jpenilla Dec 15, 2024
5724d32
Use compile classpath for restamp on fork setup
jpenilla Dec 15, 2024
b31b4ee
Set branch name when checking out repo for feature patches
jpenilla Dec 15, 2024
eeba28a
Fix warning from param name
jpenilla Dec 15, 2024
cd1f201
Split repo patch set type from directory, add convenience helpers
jpenilla Dec 15, 2024
532acc5
small dsl adjustments
jpenilla Dec 15, 2024
81be42f
split single file/directory patching registration
jpenilla Dec 15, 2024
d06d647
Fix missing feature patch dir breaking build
jpenilla Dec 15, 2024
12e88ef
Split fork library imports into separate task
jpenilla Dec 16, 2024
20603d4
fix: fixup file patches must use proper upstream
MiniDigger Dec 16, 2024
22a57ff
Replace ensureClean util
jpenilla Dec 16, 2024
00abd06
Don't apply fork ATs when the file is blank
jpenilla Dec 16, 2024
3b11fc0
Rename upstream apply task
jpenilla Dec 16, 2024
e69ee60
Write rejects for single file patches
jpenilla Dec 16, 2024
541bc82
only use jar files for jst classpath
jpenilla Dec 16, 2024
1fe5dcd
Don't configure ATs in PatchingTasks for now
jpenilla Dec 16, 2024
e9e116c
Fix rebuild patches adding a blank line to empty AT files
jpenilla Dec 16, 2024
01e9e47
- rework library file imports
jpenilla Dec 17, 2024
fb9a4b2
gzip library file index and optimize disk format
jpenilla Dec 17, 2024
2ae9e0c
simplify and deduplicate logic between CopyAndTag/FilterRepo
jpenilla Dec 17, 2024
5d60ab5
Update ForkSetup for JST changes
jpenilla Dec 18, 2024
56460b0
Remove some unused code
jpenilla Dec 18, 2024
6faec80
Rename and reorganize patching tasks, add task descriptions, make fil…
jpenilla Dec 18, 2024
a6f1ffd
Fix ApplyFilePatchesTest
jpenilla Dec 18, 2024
33a1115
Make bundler/paperclip tasks not cached by default
jpenilla Dec 18, 2024
a0c517c
Allow configuring JavaLauncher used for userdev setup
jpenilla Dec 18, 2024
7070d20
Update JST
jpenilla Dec 18, 2024
5735450
Don't cache RemapJar by default
jpenilla Dec 18, 2024
b860b20
Properly name fork bundler/paperclip jars
jpenilla Dec 18, 2024
544cdf1
Only register SetupPaperScript for Paper
jpenilla Dec 19, 2024
9ceaf62
Don't change task names for Paper
jpenilla Dec 20, 2024
55c27c4
fix tests
jpenilla Dec 20, 2024
36a2b97
Remove unused feather dep, move jgit dep to core as it's not needed b…
jpenilla Dec 20, 2024
bd0e9e5
Copy single file patch result even on failure
jpenilla Dec 20, 2024
62ab0ce
Rename src/vanilla to src/minecraft
jpenilla Dec 20, 2024
5335cd1
Clean up task groups
jpenilla Dec 20, 2024
82f1cd2
Always create base tag before applying file patches
jpenilla Dec 21, 2024
843f5d7
fix regression in fork minecraft patching task names
jpenilla Dec 21, 2024
0708c7b
Single file patch improvements
jpenilla Dec 21, 2024
e8ebbf2
Replace UpstreamConfig#paper property with UpstreamConfig#applyUpstre…
jpenilla Dec 21, 2024
dd05713
Use Minecraft libraries instead of compile classpath for fork AT clas…
jpenilla Dec 21, 2024
a8b8cd1
Update deploy-snapshot.yml
jpenilla Dec 21, 2024
4819e28
Renames and minor cleanup
jpenilla Dec 21, 2024
331680b
Move some tasks to core and other misc cleanup
jpenilla Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use Minecraft libraries instead of compile classpath for fork AT clas… 
…spath

We may need to revisit this in the future, but it seems to work with basic testing and provides a decent speedup by not needing to compile -API
  • Loading branch information
@jpenilla
jpenilla committed Dec 21, 2024
commit dd057132130d2bb970bc425d9ee24c7e790a167a
3 changes: 1 addition & 2 deletions ...ht-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/ServerPatchingTasks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import org.gradle.api.Task
import org.gradle.api.file.Directory
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.plugins.JavaPlugin
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.TaskContainer
import org.gradle.kotlin.dsl.*
Expand Down Expand Up @@ -170,7 +169,7 @@ class ServerPatchingTasks(
libraryImports.set(importLibFiles.flatMap { it.outputDir })
atFile.set(mergeCollectedAts.flatMap { it.outputFile })
ats.jst.from(softspoon.jstConfig)
ats.jstClasspath.from(project.configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME))
ats.jstClasspath.from(softspoon.macheMinecraftLibraries)
}

applySourcePatches.configure {
Expand Down
Loading