Commit Graph

1051 Commits

Author SHA1 Message Date
shedaniel
fb0f6badd5 Fix alfd-transformed affecting automatic module name generation
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-04 09:23:56 +08:00
shedaniel
55bb78a439 Fix missing forge jar prefix in Forge 1.16
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-03 10:18:33 +08:00
shedaniel
e38fa2ef72 Fix DependencyDownloader to not include two versions of the same dependency
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-02 11:34:39 +08:00
shedaniel
edc3c82175 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.11.0
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java
2022-03-02 11:23:00 +08:00
shedaniel
8131dd7405 Fix checkstyle, replace "replace" with "add"
Weird that it worked though

Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-02-17 01:21:51 +08:00
shedaniel
217ed9d1af Add option to inject AWs
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-02-16 14:51:05 +08:00
shedaniel
403d7c9484 Allow declaring interface injections in the architectury.common.json
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-02-16 13:44:49 +08:00
shedaniel
ced2fa30a1 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-02-16 13:39:08 +08:00
modmuss50
56d8bcfcea Create .idea dir if it doesn't exist. 2022-02-11 20:11:14 +00:00
Juuz
ea9193870e Fix MinecraftPatchedProvider not storing files in its own working dir 2022-02-05 17:20:12 +02:00
modmuss50
94ce38068c Filter out classpath entries that do not exist. 2022-02-01 14:34:32 +00:00
Juuz
ec6f3680fe Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0 2022-01-31 17:15:36 +02:00
Juuxel
5dda747cee Add file mappings layer (#590)
* Support passing FileSpecs around for the FileSpec notation

* Add file mappings layer

* Add better tests for file mappings

* Remove unnecessary param in setup closure call

* Fix test code style

* Add ZipUtils.isZip

* Automatically detect whether the file is a zip

* Rename LayeredMappingSpecBuilder.fileMappings -> mappings

* Add test for file mappings in layered mappings, fix inconsistent hashCode being

* Resolve reviews
2022-01-31 14:50:19 +00:00
Juuz
3776db3a5a Fix more weird edge cases in SrgMerger 2022-01-30 18:15:22 +02:00
modmuss50
287e6cefb9 Fix crash with Gradle 7.4+ during idea sync. 2022-01-29 18:14:13 +00:00
Juuz
a8a91164c4 SrgMerger: Fix reading tsrg2 files with proguard
Please be fixed now. *Please*
2022-01-28 21:21:07 +02:00
Juuz
1abf60372b Fix up SrgMerger, hopefully for the last time 2022-01-28 16:05:51 +02:00
Juuz
f2aa466884 Centralise Forge log spam suppression into one place 2022-01-27 22:02:14 +02:00
Juuz
0697768f65 Get rid of duplicate jar prefix in ProcessedNamedMinecraftProvider 2022-01-27 21:32:05 +02:00
Juuz
3b9058f64b Set AbstractRemapJarTask.remapperIsolation default value to true
This matches what we did before.
2022-01-27 19:57:56 +02:00
Juuz
0f73e65a59 Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
2022-01-27 19:56:59 +02:00
Juuz
3d5f61321b Revert "Workaround FabricMC/fabric-loom#587"
This reverts commit 3953aeda52.
2022-01-27 19:55:23 +02:00
modmuss50
4fe19028cf Add option to isolate the tiny remapper instance between sub-projects. (#588) 2022-01-27 17:08:17 +00:00
modmuss50
03089cf6d7 Setup remapped variants in afterEvaluate to work around issues caused by creating the lazy remap tasks too early. (#586) 2022-01-27 16:01:46 +00:00
Juuz
1ebc8dedd8 Fix MappingsProviderImpl.areMappingsMergedV2 2022-01-27 17:40:34 +02:00
Juuz
d8861b548f Fix srgmerger including broken mappings for subclasses 2022-01-27 16:51:19 +02:00
shedaniel
3953aeda52 Workaround FabricMC/fabric-loom#587
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-01-27 20:58:18 +08:00
shedaniel
bd3d9794b6 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-01-27 20:41:37 +08:00
modmuss50
f1bc512eca Handle no sourcesElements configuration. 2022-01-26 14:15:44 +00:00
modmuss50
98b87969cb Don't try to update LWJGL 2 to 3 on arm machines. 2022-01-26 13:52:36 +00:00
Juuz
9acfc71003 Actually fix mixin refmaps by removing broken containsKey 2022-01-26 15:14:18 +02:00
Juuz
849961adf4 Actually fix mixin configs by configuring them in afterEvaluate 2022-01-26 14:49:01 +02:00
Juuz
6cdf12994b Fix mixin refmaps on Forge 2022-01-26 14:36:34 +02:00
Juuz
5c0bceff27 Fix missing mixin configs in mod jars 2022-01-26 14:27:32 +02:00
Juuz
922bfb6e6e Fix SRG jars not being generated 2022-01-26 13:51:24 +02:00
Juuz
7222234138 Yeet our custom decompiler API since Fabric's works now 2022-01-25 20:58:37 +02:00
Juuz
8e138cf9e3 Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
2022-01-25 20:54:05 +02:00
modmuss50
d4be1e7bdc Fix issues resolving libraries and natives for old mc versions down to 1.3.2. (#584)
* Fix issues resolving libraries and natives for old mc versions.

Add a simple integration tests.

Fixes #583 and #582

* Test 1.6.4 and 1.3.2
2022-01-25 15:37:03 +00:00
modmuss50
316f9d9508 Update java-objc-bridge for arm64 MacOS support. Fixes the narrator. 2022-01-24 19:48:25 +00:00
Lovely_xianxian
46c6a2757a Add support for mixins written in groovy (#580) 2022-01-24 19:05:55 +00:00
modmuss50
9662a8b3de Support injecting interfaces from the mod source. Add a comment to target classes saying what mod is providing an injected interface. (#581) 2022-01-24 15:21:00 +00:00
modmuss50
a712954be2 Depend on decompilerOptions.getClasspath() build tasks.
This doesn't feel necessary but seems to solve it.
2022-01-23 18:26:56 +00:00
modmuss50
a598625146 Make DecompilerOptions.getClasspath() an input for GenerateSourcesTask 2022-01-23 14:53:07 +00:00
modmuss50
b69404ea03 Fix DecompilerOptions.getClasspath()
I was blind and looking for this on the fork options...
2022-01-22 23:30:07 +00:00
Juuz
b883c1a0cb Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
# Conflicts:
#	src/main/java/net/fabricmc/loom/util/Constants.java
2022-01-21 17:28:05 +02:00
Juuz
a7c3a9f740 Fix Aw2At not being applied 2022-01-21 01:21:54 +02:00
Juuz
14db61e6e6 Fix SrgMerger's output field descs being null 2022-01-21 01:21:44 +02:00
Juuz
4f73f85e3a Fix SrgMerger copying srg names instead of obf names to fill missing names 2022-01-21 01:06:24 +02:00
Juuz
7ede01f92e Fix weird race condition 2022-01-21 01:00:58 +02:00
Juuz
bd22f11628 Rewrite SrgMerger 2022-01-21 00:21:45 +02:00