Commit Graph

1803 Commits

Author SHA1 Message Date
Juuz
b1ed6a4606 MappingConfiguration: Remove optimised merged v2 code path
This was leaving the broken "intermediary, named, official"
namespace order from layered mappings. While it could've been
fixed there, the optimised code path also lacked some fixes
to enclosing classes from MappingsMerger, so it's better to
use the "vanilla" code from Fabric.
2024-07-01 23:39:33 +03:00
Juuz
d29605ce33 Fix plugin id in composite build test 2024-07-01 23:19:10 +03:00
Juuz
79f0c86ec5 Stabilise RunConfigSettings.mods 2024-07-01 20:12:51 +03:00
Juuz
aab2acc3f8 Remove empty file 2024-07-01 20:12:19 +03:00
Jab125
9e4a70f742 Fix Forge 50 (1.20.6) (#219)
Co-authored-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2024-07-01 20:04:40 +03:00
Juuz
6f463e9751 Merge 1.7, part 4 2024-07-01 20:01:06 +03:00
Juuz
a0d33732a3 Merge 1.7, part 3 2024-07-01 19:55:25 +03:00
Juuz
db95e8af23 Fix Forge jij 2024-07-01 19:51:33 +03:00
Juuz
4ae4134b70 Merge 1.7, part 2 2024-07-01 19:28:43 +03:00
Juuz
6f08fa51ec Merge 1.7, part 1 2024-07-01 19:20:21 +03:00
modmuss
097fd98fc9 Update to Gradle 8.8 (#1125) 2024-06-14 08:49:47 +01:00
modmuss50
eacd6fbc5f Don't throw when loom was unable to stop the worker, as it may have already been stopped by Gradle. 2024-06-13 22:14:37 +01:00
modmuss50
bee963b1d0 Reset decompiler cache with refresh deps 2024-05-23 17:40:32 +01:00
modmuss50
7c70a5f8a4 Fix handling of classes with no package in CachedJarProcessor.
Closes #1121
2024-05-23 16:45:25 +01:00
modmuss50
63214b491f Don't print warning about incorrect sources jar when there is no sources jar. 2024-05-16 21:17:14 +01:00
modmuss
8110523508 Add super classes to decompiler cache ClassEntry (#1118)
* Add super classes to decompiler cache ClassEntry

* And implement

* Add existing classes jar for the decompiler
2024-05-14 21:31:26 +01:00
Juuz
8da7cc0f87 Fix launching 1.20.6 NeoForge with Yarn (#213)
Fixes #212.
2024-05-11 16:00:14 +03:00
modmuss
db65759c88 Experimental Sandbox support (#1107) 2024-05-09 09:10:05 +01:00
shedaniel
52b59feecb Refactor field migration into a more generalized migrator + add metho… (#209)
* Refactor field migration into a more generalized migrator + add method inheritance migrator

* Fix typo and clean up the method

* I can't spell
2024-05-07 14:07:33 +00:00
modmuss
5b7d598d02 More work towards config caching support (#1115) 2024-05-05 10:21:36 +01:00
modmuss
8ba38ef904 Fix Mojang mappings with noIntermediateMappings (#1114)
* Try to fix mojang mappings with no intermediary mappings

* Fix
2024-05-05 09:20:46 +01:00
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
shedaniel
ff3546e108 Merge remote-tracking branch 'FabricMC/dev/1.6' into dev/1.6 2024-04-28 20:22:49 +09: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
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
shedaniel
6508030d45 Add the updated neoforge AT for J21 & update ASM 2024-04-09 02:03:03 +09:00
shedaniel
f669cb3c2b Fix deleteParameterNames on null parameter names (Yes apparently that is in spec) 2024-04-09 02:02:36 +09:00
shedaniel
06111ac2fd Finalize silentMojangMappingsLicense on read, close #203 2024-04-06 02:43:49 +09:00
shedaniel
6497070b19 Publish and mark Loom 1.6 as beta 2024-04-05 00:18:09 +09:00
shedaniel
3cd4740780 Fix unit tests 2024-04-05 00:17:31 +09:00
shedaniel
deaee2ad65 Workaround inner classes decompilation on Forge 2024-04-04 23:19:37 +09:00
shedaniel
377c0e933a Detect neoforge.mods.toml on NeoForge 2024-04-04 22:29:45 +09:00
shedaniel
72269221ef Fix checkstyle violations 2024-04-04 22:27:45 +09:00
shedaniel
63f00eecf4 Merge remote-tracking branch 'origin/dev/1.5' into dev/1.6 2024-04-04 22:19:13 +09:00
shedaniel
cd1267c4c0 Mark Loom 1.5 as stable 2024-04-04 22:18:49 +09:00
shedaniel
e6c2c6eda9 Merge remote-tracking branch 'origin/dev/1.4' into dev/1.5
# Conflicts:
#	src/main/java/net/fabricmc/loom/util/Constants.java
2024-04-04 22:18:36 +09:00
shedaniel
6062d38509 Mark Loom 1.4 as deprecated 2024-04-04 22:18:10 +09:00