Commit Graph

1860 Commits

Author SHA1 Message Date
shedaniel
649bbcaf55 Merge remote-tracking branch 'upstream/exp/1.4' into exp/1.4
# Conflicts:
#	.gitignore
#	build.gradle
#	settings.gradle
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2023-09-23 16:11:29 +08:00
shedaniel
54f252f6b5 Remove beta warning 1.3 2023-09-23 15:59:30 +08:00
shedaniel
ec6b2b0392 Merge remote-tracking branch 'origin/dev/1.2' into dev/1.3 2023-09-23 15:53:45 +08:00
modmuss
bd09af1783 Downloader: Protect against partially downloaded files. (#954)
* Downloader: Protect against partially downloaded files.

* Cleanup

* Add 1 minute timeout.

* Checkstyle
2023-09-22 18:55:44 +01:00
modmuss50
0b36121357 Add Fabric-Jar-Type to jar manifest.
Either 'classes' or 'sources', the idea is mod distribution platforms can check that sources jars are not uploaded accidentally.

Closes #939
2023-09-11 11:47:19 +01:00
modmuss
1a4f76584f Fix reproducable zips across timezones. (#952)
* Create test for zip timezones

* Fix :)

* Update ReproducibleBuildTest

* Update windows hashes
2023-09-11 11:31:10 +01:00
modmuss
71b7bea854 Support the Vineflower decompiler (#951) 2023-09-11 11:29:01 +01:00
modmuss
0a3779f41d Fix and test FabricApiExtension not supporting deprecated modules. (#950) 2023-09-09 22:37:02 +01:00
modmuss
e924faf44e Support reading "development" dependencies from the installer json. (#949)
* Support reading "development" dependencies from the installer json.

* Fix checkstyle and comment.
2023-09-09 22:36:51 +01:00
modmuss50
4caf4f831e Sort client only entries, fixes #940 2023-09-09 17:31:43 +01:00
modmuss
ae159dd126 Support Zip.getEntryCompression() setting (#936)
* Support Zip.getEntryCompression() setting

* Checkstyle

* Set for both the entry and ZOS
2023-09-09 13:21:43 +01:00
Luke Bemish
0dc2d67317 Add extension option to configure known INVOKEDYNAMIC BSMs (#945)
* Set up configuration for known indy bsms

* Make ignoredIndyBsms apply to service remapper

* Add groovy indy instruction to default known BSMs

* Address feedback

---------

Co-authored-by: modmuss <modmuss50@gmail.com>
2023-09-09 13:21:14 +01:00
modmuss
777a05457c Filter out the authentication error when starting in development (#948) 2023-09-09 13:18:14 +01:00
shedaniel
fce31a4f1d Delete forge mods' jarjar metadata (#159)
* Delete forge mods' jarjar metadata

* Update ZipUtils.java

* Update src/main/java/net/fabricmc/loom/util/ZipUtils.java

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>

---------

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2023-09-05 03:30:13 +08:00
SettingDust
2b64c2f803 fix: missing a patch for #153 that c29090037f change the method name (#156) 2023-08-27 14:26:06 +03:00
PoTheMagicDragon
116a2f1746 Update README.md to use the correct link (#158)
[ci skip]
2023-08-27 14:23:47 +03:00
modmuss
3a090917ff Update to Gradle 8.3, and update all other deps. (#946)
* Update to Gradle 8.3, and update all other deps.

* Fix tests

* Lazily download decompilers, generate version constants to ensure they are synced between the build and Gradle.

Each decompiler has a configuration, this allows the version to be changed at a later date if needed.

* Fix typo :)

* Oh so many versions
2023-08-24 10:18:25 +01:00
modmuss50
fc9041a071 Start on Loom 1.4 2023-08-22 22:52:10 +01:00
SettingDust
25eefb5d62 Make all jars nestable on Forge (#153)
Fixes #152.
2023-08-12 23:09:40 +03:00
Juuz
66edc601f5 RemapJarTask: Avoid reordering nested jars
Fixes #155.
2023-08-12 13:02:57 +03:00
Juuz
b0840803a5 Add a mod settings container to RunConfigSettings (#145)
Closes #144.
2023-08-12 12:41:27 +03:00
Juuz
39426ac20e Merge remote-tracking branch 'upstream/dev/1.3' into dev/1.3 2023-08-12 01:22:31 +03:00
Juuz
65bb884401 Merge branch 'dev/1.2' into dev/1.3 2023-08-12 01:22:09 +03:00
modmuss
ffc786d3cd Fix gradle properties not being read from sub projects correctly. (#941)
Workaround gradle/gradle#23572
2023-08-10 16:46:25 +01:00
shedaniel
7a26b375e0 Support Neo (#154) 2023-08-09 04:41:58 +08:00
Juuz
3019b32fd7 Publish 1.3 beta builds 2023-07-22 01:30:02 +03:00
Juuz
236f035ebe actions: Restore test-push.yml to be closer to upstream 2023-07-19 17:50:41 +03:00
Juuz
f51a9a59de Merge remote-tracking branch 'upstream/dev/1.3' into dev/1.3
# Conflicts:
#	src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
2023-07-19 12:56:27 +03:00
Juuz
2de23d12cf Update TR and fix compilation errors 2023-07-19 12:14:34 +03:00
modmuss50
cfe72b933a Improve Kotlin version detection 2023-07-06 13:06:07 +01:00
modmuss50
63eaeed496 Add comment to ZipReprocessorUtil.appendZipEntry 2023-07-04 17:15:54 +01:00
modmuss
e49a051ea0 Fix included none mod libraries not being reproducible. (#923)
Closes #921
2023-07-04 17:13:48 +01:00
modmuss
6413a9312c Create RunConfigSettings with Gradle's object factory (#917)
* Create RunConfigSettings with Gradle's object factory

* Update src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>

* Update FabricAPI test

* Fix version

* Actually fix test

* Just make the minimal changes for now

---------

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2023-07-03 17:45:13 +01:00
modmuss
8ddf572a7c Client annotation processor configuration extendsFrom "annotationProcessor" (#918) 2023-07-02 21:39:06 +01:00
Juuz
28b8caf8f1 Make resolvable copies of configurations not consumable (#920)
This prevents info-level log warnings from mod remapping
from flooding the console.
2023-07-02 21:38:55 +01:00
Juuz
60e0aaf823 Merge remote-tracking branch 'upstream/dev/1.3' into dev/1.3
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
2023-06-30 16:23:49 +03:00
Juuz
7a9849bfcf Fix ClassCastExceptions 2023-06-30 15:53:19 +03:00
modmuss50
8abe00a2b1 Fix gen sources without unpick 2023-06-27 20:54:34 +01:00
qwertyuioplkjhgfd
867793d8c3 Fix constructor mappings with layered mappings (#881)
* add AddConstructorMappingVisitor

* add constructor test

* Update src/main/java/net/fabricmc/loom/configuration/providers/mappings/utils/AddConstructorMappingVisitor.java

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>

* apply requested changes

---------

Co-authored-by: qwertyuioplkjhgfd <qwertyuioplkjhgfd@users.noreply.github.com>
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2023-06-27 14:16:40 +01:00
modmuss
f06bc6f735 Don't use arg files when running in a none ascii path (#916) 2023-06-27 14:06:48 +01:00
modmuss50
ffe4d52a12 Improve GenerateSourcesTask error message.
Closes https://github.com/FabricMC/fabric-loom/issues/914
2023-06-27 09:27:59 +01:00
modmuss
8b3b9b4aed Use intermediate provider name in cache key (#912) 2023-06-23 17:17:58 +01:00
modmuss
a2b541818c Apply AW as a TR AnalyzeVisitor (#892)
* Apply AW as a TR AnalyzeVisitor

* Update TR
2023-06-23 15:29:24 +01:00
modmuss50
2e31f8accb Use project specific cache dir in IncludedJarFactory.
Fixes https://github.com/FabricMC/fabric-loom/issues/911
2023-06-23 15:20:29 +01:00
Juuz
c72bdb5eea Fix compilation errors 2023-06-21 21:48:17 +03:00
Juuz
13cfbb9da5 Merge remote-tracking branch 'upstream/exp/1.3' into exp/1.3
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
2023-06-21 21:40:25 +03:00
Juuz
e0efe9ce60 Remove beta warning 1.2 2023-06-21 21:30:29 +03:00
modmuss
4e593fc5ae Rework how unpick and linenumber maps are applied (#907)
This should hopefully vastly improve debugging, and more imporantly not work in a consistant manner, making debugging issues a lot easier.

This commit contains an intergration test that uses a real debugger to check that breakpoints are being fired as expected.
2023-06-16 21:55:04 +01:00
modmuss
fe823ddb30 Add an internal API to allow 3rd party loom extensions to add library processors. (#906)
Stability of this API will not be guaranteed.
2023-06-15 20:14:52 +01:00
modmuss
590686fe1a Fix + test minecraft metadata downloading (#905) 2023-06-13 21:24:46 +01:00