Commit Graph

1368 Commits

Author SHA1 Message Date
Space Walker
c5c52aba65 Use different cache files for custom manifest and metadata jsons (#1077)
* use different cache files for custom manifest and metadata jsons

* add properties for custom manifests to loom extension api

* expand manifests api with a priority queue

* add ApiStatus annotations where needed

* explain sort order in javadoc

* add getVersionMetaFileName function

* merge the two manifests locations together

* convert hash code to hex string

* fix metadata provider tests

* update priorities of built in manifests so they're first by default

* fix VersionsManifestAPI javadoc

* update comment in MinecraftMetadataProvider

* fix ManifestLocation.cacheFile

* deprecate and replace getCustomMinecraftManifest
2024-05-04 18:18:26 +01:00
Luke Bemish
63ebc35e1d Improve how include configuration works (#1080)
* Initial work on better include configuration

* Remove unused members

* Substantially simplify

* Only process configuration once

* Hopefully fix tests

* Make platform dependencies work again

* Fix edge case where include or super configuration has withDependencies action

* Fix including subproject/composite jars and add test

* Remove needless following of external result

* Change priority for module location discovery

* Fix failing test

* Apply suggestions from code review

Co-authored-by: modmuss <modmuss50@gmail.com>

---------

Co-authored-by: modmuss <modmuss50@gmail.com>
2024-05-04 18:16:32 +01:00
modmuss50
cb2af08c31 Remove packages from log4j config 2024-05-04 18:15:00 +01:00
modmuss50
0b2d683c1c Improve error message when failing to parse fmj json.
Closes #1103
2024-05-04 18:12:57 +01:00
modmuss
be1e207ebd Stop Gradle daemon after unrecoverable zip errors (#1113) 2024-05-02 18:08:33 +01:00
modmuss
2752dc3a6a Make Vineflower the default decompiler (#1110) 2024-04-26 11:52:26 +01:00
modmuss
2c3a0adb5b Add manifest entry allowing deps to define known bsms (#1111) 2024-04-26 11:52:09 +01:00
modmuss
1fac65c415 Add test to prove closed zip filesystem issue (#1108) 2024-04-26 09:05:49 +01:00
modmuss50
683a3ba523 Merge remote-tracking branch 'origin/dev/1.6' into exp/1.7 2024-04-25 20:26:24 +01:00
modmuss
bd009515cb Update loom native, with better error handling. (#1102) 2024-04-20 22:49:21 +01:00
modmuss
e142cb8d0c Print file locks in more cases during decompile (#1099) 2024-04-17 20:41:29 +01:00
modmuss
9a3b82c8a3 Initial config caching work (#1053) 2024-04-15 18:56:59 +01:00
modmuss
b8da4e5498 Update dependencies (#1089)
* Update depedencies

* Fix Gradle 9 deprecation warning

* No need for the shadow jar plugin
2024-04-15 15:12:49 +01:00
modmuss
7010ad633b Fix sources publishing (#1098)
* Fix sources publishing

* Revert "Fix sources publishing"

This reverts commit a3fec653dc5255b9bc939dd3305e5df8529da729.

* A better fix
2024-04-15 15:12:10 +01:00
modmuss
1b1168d7e2 Fix and test line number remapper (#1097) 2024-04-15 15:11:57 +01:00
modmuss50
befebfba9e Merge remote-tracking branch 'origin/dev/1.6' into exp/1.7 2024-04-15 10:58:56 +01:00
modmuss
02af089e57 Lock disowning +write linemap txt file for debugging (#1094)
* Write line map file (#1090)

* Lock disowning (#1093)

* Lock disowning

* Comment fix

* Typo

* Use a much lower lock timeout on CI
2024-04-14 15:14:44 +01:00
modmuss50
24a38025cf Bump version 2024-04-10 09:09:06 +01:00
modmuss
7a89e40fd0 Update Loom native (#1085) 2024-04-04 11:45:14 +01:00
modmuss
e96c0e2fbd Fix remapped sources publishing (#1084) 2024-04-01 21:13:50 +01:00
modmuss50
ba8124e2d6 Set artifact urls for the Mojang maven repo in the correct place. 2024-04-01 15:00:03 +01:00
modmuss50
4b5f62e6b1 Fix custom decompiler test 2024-03-21 19:24:42 +00:00
modmuss50
658ca0c709 Replace hard link with move.
Fixes https://github.com/orgs/FabricMC/discussions/3659
2024-03-20 23:03:25 +00:00
modmuss50
713e1ff268 Enable decompile cache by default 2024-03-20 10:34:19 +00:00
modmuss50
c3dd16d9bf Fix idea sync task group 2024-03-20 10:26:00 +00:00
modmuss50
d0feecfbcb Don't fail setup if a project FMJ is invalid. 2024-03-19 23:03:49 +00:00
modmuss50
ae9db3fbbd Fix datagen run config having incorrect name. Closes #1000 2024-03-19 22:15:33 +00:00
modmuss50
4084fa3eb9 Add classname to stracktrace when Kotlin remapping fails. Closes #1045 2024-03-19 22:03:01 +00:00
chris
c1d51b1149 Introduce SemVer version parsing to included mods/libraries (#1075)
* Introduce SemVer version parsing & ".Final" suffix stripping to included mods/libraries

* Address review about `CONSTANT_CASE` variables, add unit test

* thanks spotless :/
2024-03-19 20:23:29 +00:00
modmuss
455b9d6aed Only set startFirstThread on versions using LWJGL 3 (#1076)
* Only set startFirstThread on versions using LWJGL 3

* Lazily evaluate RunConfig
2024-03-19 20:08:35 +00:00
Space Walker
3670ccb959 Support merging pre 1.3 Minecraft versions. (#1026)
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2024-03-19 17:25:57 +00:00
modmuss50
30ef45e878 Fix async zip processor executor.
Virtual threads are much slower, lets not worry about them for now.
2024-03-18 16:24:07 +00:00
modmuss
c2a9c2f18d Async line number remapping (#1074) 2024-03-18 15:42:57 +00:00
modmuss
7bb1224642 Experimental Decompiler cache (#1043) 2024-03-17 22:28:47 +00:00
modmuss
dbebbdb944 Add RemapJarTask.getOptimizeFabricModJson() (#1068)
* Optimise fabric.mod.json files

* Fixes

* Make opt-in

* Revert

* Fix
2024-03-12 19:11:26 +00:00
modmuss
5caac7ba8e Fix possible race condition in PrepareJarRemapTask (#1065)
* Fix possible race condition in PrepareJarRemapTask
2024-03-12 13:26:14 +00:00
modmuss
c60b456f7e Print info about locked files during configuration or genSources (#1066)
* Print info about locked files during configuration or genSources

* Use release version

* Output adjustments

* Fix build

* Add user back
2024-03-11 21:16:46 +00:00
modmuss
994a97e3de Refactor MinecraftMetadataProvider to create it earlier (#1072) 2024-03-11 12:57:52 +00:00
modmuss
f0ca06f912 Cleanup MinecraftJarConfiguration (#1070)
* Cleanup MinecraftJarConfiguration

* Fixes

* Fixes
2024-03-11 11:36:52 +00:00
Flemmli97
21b7dd9b99 Use last 16 chars for checksum (#1064)
* Fix deprecation warning in Gradle 8.7 (#1056)

* use last 16 chars for checksum

* hash the path

Co-authored-by: Flemmli97 <Flemmli97@users.noreply.github.com>
2024-03-10 13:39:22 +00:00
modmuss
2e74a84d37 Check Minecraft java version (#1059)
* Fix deprecation warning in Gradle 8.7 (#1056)

* Check Minecraft java version

* Fix

* Fix

* Fix
2024-03-10 13:38:37 +00:00
modmuss
b44e4ec3d5 Add API to get named minecraft jars. (#1063) 2024-03-10 13:37:45 +00:00
LlamaLad7
04ca22c225 Refactor/better kotlin metadata (#1061)
* Kotlin: Don't depend on metadata internals.

* Kotlin: Remap type parameter annotations.

* Kotlin: Bump metadata to 0.9.0
2024-03-04 09:40:09 +00:00
FirstMegaGame4
ae1ba0ab86 Injected Interfaces, Generics Support (#1050) 2024-02-25 15:26:00 +00:00
modmuss
0dc1ba012a Update deps (#1054) 2024-02-24 15:04:56 +00:00
modmuss50
cfba0b18cd Update wrapper validation task 2024-02-19 22:10:38 +00:00
modmuss50
7904141677 Prevent Gradle from running vscode task asynchronously
Closes #1048
2024-02-19 22:02:24 +00:00
Jason Penilla
1412f65e10 Print info about process lock owner (#1040)
* Print info about process lock owner

* format

* Fix extraneous space with empty args

* Avoid leaking sensitive info in program arguments by default

* fix indent

* switch var usage around
2024-02-19 18:35:58 +00:00
modmuss
9ea10ff759 Add Offline mode / locking test (#1046)
* Add Offline mode / locking test

* Fix

* Make offline tests more resilient
2024-02-19 18:35:43 +00:00
modmuss
f0df5a5a71 Add interface injection unit test (#1052)
* Add interface injection unit test

* Cleanup and fixes
2024-02-19 15:06:33 +00:00