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
modmuss50
9e46f0d389
Ignore gradle metadata in Mojang's maven repo.
2022-01-20 20:25:45 +00:00
Juuz
504f1648d0
Remove custom META-INF fixer from ModProcessor
...
TR's fixer is enabled for mods now (also in upstream Loom),
so it shouldn't be needed. This is easy to revert if this
breaks something.
2022-01-20 16:11:52 +02:00
Juuz
b2e7181e7c
Fix MigrateMappingsTask
2022-01-20 16:07:59 +02:00
Juuz
26122e769e
Fix AT jar processor and add a test for it
2022-01-20 15:57:49 +02:00
modmuss50
2c5baf95cb
Cleanup runtime only log4j, allow it on any version.
2022-01-19 22:41:12 +00:00
Juuz
a94cafb56c
Fix split decompilation task names for Arch decompilers
2022-01-20 00:09:14 +02:00
Juuz
db6baa837c
Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
2022-01-20 00:06:26 +02:00
Juuz
7600472a39
Fix unit tests and remove one unnecessary modification to upstream
2022-01-20 00:06:21 +02:00
modmuss50
e180e39575
Fix typo
2022-01-19 21:47:34 +00:00
Juuz
ceb09847ea
Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
2022-01-19 23:40:20 +02:00
modmuss50
9a796579e8
Disable runtime only log4j by default.
2022-01-19 21:39:27 +00:00
Juuz
161921b0fd
Checkstyle
2022-01-19 23:32:20 +02:00
Juuz
6f4cb4ae61
Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
...
# Conflicts:
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/util/Constants.java
2022-01-19 23:29:23 +02:00
modmuss50
f113b0e312
Fix server only, and broken test.
2022-01-19 20:54:24 +00:00
modmuss50
b31ce4e525
Remove log4j from compile classpath starting with Minecraft 22w03a.
...
This is done to force modders to use SLF4J as Mojang have the ability to remove it at anytime. An option is provided to disable this.
2022-01-19 20:04:10 +00:00
Juuz
2de44b8b5d
Fix ad$2_UNBREAK not remapping
2022-01-19 21:08:32 +02:00
Juuz
0e17dc3995
Fix forge_minecraft_classpath.txt not being generated
2022-01-19 20:50:53 +02:00
Juuz
bc52fc918c
Fixes
2022-01-19 20:15:11 +02:00
Juuz
69e87a685a
okay it should REALLY work now
2022-01-19 17:30:43 +02:00
Juuz
47cbcbcd36
This should be done now
2022-01-19 17:02:55 +02:00
Juuz
1bedce942e
A lot of stuff, including project ATs as a jar processor
2022-01-19 14:11:05 +02:00
Juuz
63293b3417
Merge MappingsProvider
2022-01-19 13:18:29 +02:00
Juuz
e73b11da1d
MinecraftPatchedProvider2 is now the actual thing
2022-01-18 19:01:00 +02:00
Juuz
91656cfa50
A lot of 0.11 stuff but nowhere near done
2022-01-18 18:55:52 +02:00
Juuz
0f4c4bd087
Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0
...
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
# src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
# src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
# src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/intermediary/IntermediaryMappingLayer.java
# src/main/java/net/fabricmc/loom/configuration/providers/mappings/intermediary/IntermediaryMappingsSpec.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
# src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
# src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
# src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java
# src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
# src/main/java/net/fabricmc/loom/task/service/MappingsService.java
# src/main/java/net/fabricmc/loom/util/Checksum.java
# src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java
# src/test/resources/projects/kotlin/build.gradle.kts
2022-01-18 17:43:44 +02:00
modmuss50
e9d1f005d9
Add server only jar configuration option. ( #574 )
...
* Add server only option.
* Fix crash.
* Fix unpick jar task name.
* Revert test memory change
* Dont add client only libraries.
* Fixes
* Move option to the extension
2022-01-17 22:11:08 +00:00