Commit Graph

547 Commits

Author SHA1 Message Date
Juuxel
e4d696bac2 Merge remote-tracking branch 'upstream/dev/0.5' into forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/AbstractPlugin.java
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2020-11-29 22:50:37 +02:00
modmuss50
98725f9400 Publish using github actions 2020-11-15 17:32:57 +00:00
modmuss50
d1281be741 Migrate to access-widener library (#294) 2020-11-15 16:15:02 +00:00
Kitlith
62e89395f9 Configure build task dependencies as each subproject comes up. (#299) 2020-11-15 16:05:35 +00:00
Jamie Mansfield
db623157aa Use Mercury 0.1.0-rc1 (#301) 2020-11-15 16:03:16 +00:00
zml
9b8f1b7233 eclipse: Fix run configuration generation (#285)
Fixes #283
2020-11-07 13:18:11 +00:00
modmuss50
99d7ccd477 Remove debug log out 2020-10-28 16:52:50 +00:00
modmuss50
42a0cbd3b3 Dont throw when annotationDependency is not resloved. 2020-10-21 08:59:20 +01:00
modmuss50
5c4d89bd0d Ugly fix to mercury classpath not having jetbrains annotations 2020-10-21 08:58:07 +01:00
modmuss50
a8e0c8edbb Potentially fix memory leak with the mixin AP 2020-10-21 08:57:13 +01:00
modmuss50
e545a92166 Revert "Ugly fix to mercury classpath not having jetbrains annotations"
This reverts commit 33fdd9ff
2020-10-12 19:24:11 +01:00
modmuss50
33fdd9ffb2 Ugly fix to mercury classpath not having jetbrains annotations 2020-10-10 21:13:12 +01:00
Hephaestus-Dev
86577525cd Mark auto-generated mods with a custom value (#271)
* Make the barebones `fabric.mod.json` generated for non-mod dependencies an API for ModMenu purposes to prevent large mods with many dependencies from cluttering the menu.

* Changed from providing `modmenu:api` to `fabric-loom:generated` to be agnostic about third party mod usage.
2020-10-08 20:42:07 +01:00
modmuss50
9917f30518 Export rumtime remap classpath to DLI (#277)
* Export rumtime remap classpath for https://github.com/FabricMC/fabric-loader/pull/241

* Fix bad merge
2020-09-26 18:46:35 +01:00
i509VCB
21a9209b86 Split out some constants (#267)
This pull request also reorganizes parts of the constants class into categories.
2020-09-21 20:22:31 +01:00
modmuss50
d5ed659e7d Fix nested jar stripping not working reliability 2020-09-19 14:57:17 +01:00
modmuss50
80aaf63832 Fix race condition with mixin's output mappings across source sets 2020-09-06 20:21:08 +01:00
modmuss50
20be96e733 Fix mixin mapping being shared between all projects. 2020-09-04 22:41:11 +01:00
modmuss50
545b0c946b Fix to #265
Slightly ugly but works
2020-09-04 19:12:04 +01:00
modmuss50
8b1268abe7 Fix and improve error handling around access widener remapping with shared caches 2020-08-26 20:15:21 +01:00
zml
c0ef536be4 Include exclusions in the poms generated for mods (#262) 2020-08-26 19:33:40 +01:00
zml
032c815d19 Fix non-mod project dependencies (#263)
This resolves issues in ex. a composite build
2020-08-26 19:32:34 +01:00
modmuss50
2a1aca87cc Update MCE 2020-08-26 18:29:41 +01:00
modmuss50
60909ce9a5 Tweak tests 2020-08-26 13:07:26 +01:00
modmuss50
326224ba91 Fix v2 mappings dir 2020-08-26 12:10:04 +01:00
modmuss50
8da300563a Fix or fail fast on null minecraft version. Add back the old check for mirgate mappings 2020-08-26 08:33:56 +01:00
zml
37af4c8152 Fixes for Mojang mappings handling (#264)
* Only resolve SelfResolvingDependencies once

* mojmap: Improve styling, move to a better group + artifact id
2020-08-26 08:31:42 +01:00
modmuss50
9029a699d9 Official Mojang Mappings support
# Please read and understand the EULA before using!

Use in your build.gradle with the following:

`mappings minecraft.officialMojangMappings()`

To automatically migrate to Mojang mappings run the following:

`gradlew.bat migrateMappings --mappings "net.mojang.minecraft:mappings:1.16.2"`

Co-authored-by: Ramid Khan <ramidzkh@gmail.com>
2020-08-24 22:12:26 +01:00
Fudge
c4f25622a2 Allow adding additional jar processors (#247)
* processors

* cleanup

* oops

* make changes

* blargh
2020-08-24 20:10:21 +01:00
Joshua Schirra
032ee6f9f1 fix build number not being expanded to proper value (#254)
convert String to GString so that the value is interpolated properly
2020-08-10 08:13:23 +01:00
Juuxel
daed47f3b8 Suppress warning about fabric-installer.json when running with Forge 2020-07-30 17:59:37 +03:00
Juuxel
74516ee6c0 Try to fix copyUserdevFiles for real 2020-07-30 17:38:09 +03:00
Juuxel
2f8946ed01 Try to fix userdev file copying 2020-07-30 17:30:30 +03:00
Juuxel
d4ceb857eb Fix dep refreshing being broken with ForgeUserdevProvider 2020-07-30 17:26:21 +03:00
Juuxel
0f5efe13c9 Copy userdev 'inject' files into the game jar 2020-07-30 17:22:03 +03:00
Juuxel
7f2104a44c Make the Forge universal jar's local copy have the -universal classifier 2020-07-30 17:08:01 +03:00
Juuxel
93a2113550 Copy the Forge userdev's config.json instead of the jar itself
jar = json go brrr
2020-07-30 17:01:03 +03:00
Juuxel
bc9e2e3e34 Add missing license headers 2020-07-30 16:53:51 +03:00
Juuxel
ff948558ca Revert "Remove tests"
This reverts commit a771c882
2020-07-30 16:48:24 +03:00
Juuxel
5949549194 Add Forge dependencies using the userdev jar 2020-07-30 16:45:18 +03:00
Juuxel
bee5b389c4 Make 'srg' the target namespace of remapJar when Forge is enabled 2020-07-30 16:15:23 +03:00
Juuxel
ed331990e7 Use Project.findProperty in LoomGradleExtension.isForge 2020-07-30 16:09:02 +03:00
Juuxel
3ee61ced8e MappingsProvider: Add mapping file augmented with SRG when Forge support is enabled 2020-07-30 16:03:35 +03:00
Juuxel
85eb839db1 Make all custom functional interfaces to util.function 2020-07-30 15:12:23 +03:00
Juuxel
6e5c3a8715 Make LoomGradleExtension.isForge load from gradle.properties 2020-07-30 15:10:48 +03:00
Juuxel
7c9edfedee Hook AbstractPlugin to LoomGradleExtension.isForge 2020-07-30 15:04:36 +03:00
Juuxel
f55bde4ece Clean up FsPathConsumer 2020-07-30 15:01:20 +03:00
Juuxel
a44bdba5d6 Start adding a way to disable Forge processing 2020-07-30 14:57:28 +03:00
Juuxel
a45e9f4729 Add warning in RemapJarTask for using mixins in Forge projects 2020-07-30 14:44:03 +03:00
Juuxel
186b09518b Revert "Try using SpecialSource directly instead of going through ForgeGradle"
This reverts commit 3f9c6978.
While this could work in theory, I'd also have to reimplement and run
the ForgeGradle jar stripping function myself. Delegating the work to
ForgeGradle is simple enough for now, though it limits Loom to Gradle 5.
2020-07-28 00:44:31 +03:00