Softspoon #231

MiniDigger · 2024-01-06T08:50:47Z

just opened to make reviewing the pending diff easier

ToDo

Give feedback

restamp sometimes runs oom, maybe move it to a worker queue? (misisng in setupvanilla)
don't delete git dirs (fails on windows), instead properly git reset and redo stuff
more tests (for lib patches for example)
figure out why build fails (maybe try deploying locally)
fix tests
patch libs
Make sure resource files have a new line at the end
rebuilding seams to put the diff in both source and feature patches (need to do a git reset to the file commit but also keep uncommited diff?)
rebuild file patches needs to git add
:remapMache fails for the first time, need to run :extractFromBundler first (minecraft classpath is empty because project dependencies have already been resolved by that point and they are empty because no lib file was present at that time)
paperweight-patcher
tests for paperweight-patcher
paperweight-userdev
get minecraft version from mache instead of relying on the extension
check that packaging and publishing works
nbt files seem broken
split setupvanilla into more tasks maybe?
Options

- Test with 1.21.4 - Apply paperweight to -server, not root - Rework mc classpath to use mache variants - Don't try to resolve implementation

We only need to add the mache repo and any repos declared in it's meta mache repo: needs propagation to userdev config any other repos should be declared in paper itself and also added to the dev bundle library repos

thanks copilot

This reverts commit e03710c.

removes mercury dependency, jar back down to ~15mb

…ther misc changes

Uses a hack where IntelliJ will attach sources inside the same jar as the classes. This is a working (and from what I can tell configuration cache-compatible) implementation, but is mostly the same pipeline, moved to task execution time. More work is still needed to clean this up and future-proof certain areas.

This reverts commit cc0127a.

MiniDigger force-pushed the softspoon-v2 branch 2 times, most recently from a1590bf to ae08a55 Compare January 14, 2024 09:47

MiniDigger force-pushed the softspoon-v2 branch 4 times, most recently from 063f21b to 7481b87 Compare March 30, 2024 10:52

MiniDigger force-pushed the softspoon-v2 branch from 7f353ba to 2d425ef Compare June 15, 2024 08:33

MiniDigger force-pushed the softspoon-v2 branch 3 times, most recently from 3c6d8b0 to a7412cf Compare October 26, 2024 10:17

MiniDigger force-pushed the softspoon-v2 branch 8 times, most recently from 3d1b784 to f941ce4 Compare November 2, 2024 15:33

MiniDigger force-pushed the softspoon-v2 branch 4 times, most recently from 9d67b21 to 810f4f1 Compare December 1, 2024 09:34

MiniDigger and others added 3 commits December 6, 2024 12:32

paperweight v2

0f2bab7

tests

673ce7b

Fixes

8620635

- Test with 1.21.4 - Apply paperweight to -server, not root - Rework mc classpath to use mache variants - Don't try to resolve implementation

jpenilla force-pushed the softspoon-v2 branch from 810f4f1 to 8620635 Compare December 6, 2024 20:20

jpenilla added 4 commits December 6, 2024 13:26

run spotless

392668c

Fix slf4j issue

edacf05

Remove redundant repository injection

9d336e1

We only need to add the mache repo and any repos declared in it's meta mache repo: needs propagation to userdev config any other repos should be declared in paper itself and also added to the dev bundle library repos

add paper repo to functional test project

2a33517

MiniDigger and others added 20 commits December 7, 2024 15:55

dont break nbt files

e890332

fix compile

ad77945

make sure comment is actually accurate

331988f

thanks copilot

Fix decompile not using java toolchain

23970f9

Don't shade restamp

e03710c

Revert "Don't shade restamp"

a38e7aa

This reverts commit e03710c.

Resolve restamp at runtime and run it using isolated workers

362bdd6

Start ripping out legacy code

eead554

removes mercury dependency, jar back down to ~15mb

Remove more legacy code

61eab47

Use java toolchain to run codebook

f361b18

More cleanup, update source generator helper

88bd533

Update functional test

28d3d9d

Update gradle, use attributes to declare java/gradle compatibility, o…

e194702

…ther misc changes

Initial work on updating userdev

b23d0bd

Fix rebuildPatches and work on config caching compat

6ceb7e8

Override snappy temp dir

e556389

don't copy nbt files to resources

cc0127a

Revert "don't copy nbt files to resources"

7014ccc

This reverts commit cc0127a.

use the right ignorePrefix to ignore the nbt files

8ff2d5c

MiniDigger force-pushed the softspoon-v2 branch from f81a66f to 8ff2d5c Compare December 9, 2024 21:52

jpenilla and others added 6 commits December 9, 2024 15:13

Update testing mache

89c113a

Populate mache config at execution time when config cache is reused

243ab68

allow having a not existing feature patches folder

a7f1809

Adjust CollectATsFromPatches optional inputs

f5702e0

Make patches optional for ApplyFilePatches

9848675

Disable patcher build for now

dce2d7e

electronicboy deleted the branch main December 13, 2024 21:02

electronicboy closed this Dec 13, 2024

electronicboy deleted the softspoon-v2 branch December 13, 2024 21:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Softspoon #231

Softspoon #231

MiniDigger commented Jan 6, 2024 •

edited by jpenilla

Loading

ToDo

Softspoon #231

Softspoon #231

Conversation

MiniDigger commented Jan 6, 2024 • edited by jpenilla Loading

ToDo

MiniDigger commented Jan 6, 2024 •

edited by jpenilla

Loading