Juuz
7b7d773956
Fix MojangMappingLayerTest
2022-01-21 01:44:50 +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
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
Juuz
f0ebe3aa18
Suppress codenarc's trailing whitespace rule for IdeaClasspathModificationsTest
2022-01-20 00:12:42 +02: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
5216e6f712
Change plugin ID in tests
2022-01-19 23:40:53 +02: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
a70f45d359
Thank you spotless
2022-01-19 17:25:03 +02:00
Juuz
c8b22e28c9
Fix test compilation
2022-01-19 17:08:46 +02:00
Juuz
3f9f055c1c
Remove custom version
2022-01-19 17:04:43 +02:00
Juuz
deefd2c39c
Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
...
# Conflicts:
# build.gradle
2022-01-19 17:03:22 +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
3e30defe71
Remove Blossom as it's not used anymore
2022-01-19 12:45:24 +02:00
modmuss50
54bf5480b7
Update tiny-remapper
2022-01-18 19:36:09 +00: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
modmuss50
d71af0cfd7
Kotlin metadata annotation remapping ( #573 )
...
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com >
2022-01-16 23:48:36 +00:00
modmuss50
421b41ebc7
Fix misc jar remapping issues.
2022-01-16 17:01:56 +00:00
modmuss50
d40241d75a
Fix performance regressions in large multi-project builds. ( #571 )
...
* Perf improvements to multi-project builds.
* Fixes.
* More fixes.
* Layered mappings fixes
* Perf improvements. Undo broken fix.
* Fix remap classpath being empty.
* Another gradle bug? Either way this is fine and works.
* Fix broken test
* Final fixes?
* Fix and cleanup mixin ap mappings.
2022-01-14 19:50:45 +00:00
shedaniel
874671eb7f
Fix merge conflicts, it compiles, but shouldn't work
...
Signed-off-by: shedaniel <daniel@shedaniel.me >
2022-01-06 16:03:03 +08:00
shedaniel
158185d374
Merge branch '0.11.0-interf' into dev/0.11.0
...
# Conflicts:
# .github/workflows/test.yml
# build.gradle
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/JarRemapper.java
# src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
# src/main/java/net/fabricmc/loom/build/ModCompileRemapper.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/JarManifestConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java
# src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
# src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
# src/main/java/net/fabricmc/loom/task/LoomTasks.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
# src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
# src/main/java/net/fabricmc/loom/util/Constants.java
# src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
2022-01-06 15:28:38 +08:00
shedaniel
6bca7d2b60
Merge remote-tracking branch 'architectury/dev/0.10.0' into dev/0.11.0
2022-01-06 15:12:59 +08:00
modmuss50
6fd3d5d021
Delete existing sources jar when re-running jar processors. Fixes #560
2022-01-05 09:58:19 +00:00
modmuss50
240a23f52d
Improve decompiler options by moving them away from the task.
...
Done because the split jar changes required registering the decompiler task after evaluation.
As there may be more than one decompile task, the options are set per decompiler and not per task.
This should also make easier to add new decompilers without requiring a plugin.
2022-01-05 09:49:11 +00:00
modmuss50
19143fc5a8
Remove JarProcessor#isInvalid and impl getId correctly.
2022-01-04 21:40:20 +00:00
modmuss50
4158062ce5
Experimental support for split common and clientonly minecraft jars. ( #561 )
...
This lays the ground work for split client and server mod code. With this first phase when enabled loom will generate a clientonly and common minecraft jar. Fabric loader and API will both need changes to support this before it can be used to develop mods.
Phase two of this project will handle splitting mod code into a client and common source set along with spliting any dependencies.
Mostly fixes #539 by sepreating decompile tasks
2022-01-04 21:19:03 +00:00
shartte
ccfe12eb17
Interface Injection ( #496 )
...
* Added interface injection via fabric.mod.json.
* Added interface injection
* Added amending of class signature with injected interface.
2022-01-04 18:15:21 +00:00
modmuss50
03d3950d11
Exclude client only libraries in server run task.
2021-12-30 00:15:18 +00:00