Commit graph

498 commits

Author SHA1 Message Date
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
modmuss50
9d142efb01 Use docker containers in github actions, should be more reliable 2020-07-27 00:09:42 +01:00
modmuss50
db1fe88fcc Fix genSources on sub projects 2020-07-26 23:42:15 +01:00
Reece Dunham
1955bcb2ea General cleanup 2020-07-26 21:32:10 +01:00
modmuss50
6083146127 Post merge checkstyle 2020-07-26 21:26:25 +01:00
modmuss50
de688c14ad Merge branch 'shared_caches' into dev/0.5
# Conflicts:
#	src/main/java/net/fabricmc/loom/AbstractPlugin.java
2020-07-26 21:25:09 +01:00
modmuss50
cb52cabb18 Add Experimental CFR support. Line numbers and comments are not currently supported. 2020-07-26 21:22:17 +01:00
modmuss50
88f5894570 Deprecate using minecraft as the gradle extension name in place of loom. Both will work for now. 2020-07-26 21:16:22 +01:00
Jaideep Singh Heer
a6f7e2cbbb
Fix issue #243 by using ResolvedConfiguration and ResolvedDependency. (#244)
* Fix issue #243 by using ResolvedConfiguration and ResolvedDependency.

* Fix AvoidStarImport build error.
2020-07-26 21:08:48 +01:00
Jonas Herzig
4aa840adfe
Allow IDEA run configs to be generated for non-root projects (#236) 2020-07-26 21:05:14 +01:00
Fudge
d7f61512b5
Improve error handling in the case mappings or minecraft dependency was not provided #238) 2020-07-26 21:01:18 +01:00
modmuss50
9d318dd859
Use jetbrains annotations by default. (#240)
Minecraft is also remapped to use them. Any use of jsr should be removed.
2020-07-26 20:57:58 +01:00
modmuss50
bc3ff0180a Start 0.5 dev cycle 2020-07-26 20:56:23 +01:00
Jamie Mansfield
4eb699c2fb
Match Mercury sourceCompatibility with Gradle (#224)
* Match Mercury sourceCompatibility with Gradle

* Fix checkstyle
2020-07-16 18:17:50 +01:00
ㄗㄠˋ ㄑㄧˊ
c2c3e5c3c6
github actions: add wrapper validation (#235)
It validates the checksums of Gradle Wrapper JAR files present in the source tree and fails if unknown Gradle Wrapper JAR files are found. https://github.com/gradle/wrapper-validation-action
2020-07-16 18:16:39 +01:00
modmuss50
2cf7d92796
Test against 6.6-rc-1 2020-07-15 00:52:58 +01:00
Octavia Togami
886d77ce0c
Supply the configuration to the run Exec directly (#232)
* Supply the configuration to the run Exec directly

This allows the implicit task dependencies from project() dependencies
to flow into the run tasks.

* Make unmappedMods a CFC to track task information

Deprecates the old methods, and they should probably be removed with
0.5.
2020-06-29 15:25:05 +01:00
modmuss50
b359b83d25 Remove get/setDirection 2020-06-28 13:01:49 +01:00
modmuss50
a02f81bbaa checkstyle 2020-06-28 12:55:09 +01:00
modmuss50
296eb63645 small cleanup 2020-06-28 12:51:29 +01:00
modmuss50
a19fb0f691 Fix build? 2020-06-27 20:30:21 +01:00
modmuss50
32eb0bd3c8 First pass on "shareCaches". 2020-06-27 20:18:32 +01:00
modmuss50
2d7421d4ed
Rengenerate and download all files with --refresh-dependencies (#227)
* Re generate all files with --refresh-dependencies

* Always re-process jar processors

* Update mixin compile extensions
2020-06-23 19:22:36 +01:00
modmuss50
2f6071991c Update mixin compile extensions 2020-06-21 19:29:49 +01:00
modmuss50
6e661c4bd7 Fix test sourceset not having minecraft 2020-06-19 14:08:01 +01:00
modmuss50
c1e4212eb8 update fernflower 2020-06-15 23:09:23 +01:00
modmuss50
b1ae5dee5d
Test across java and gradle versions with github actions. (#218)
* Experiment with github actions

* Fix?

* another fix

* Fix?

* Change github actions run args

* Tried and tested is better right?

* spaces spaces spaces

* revert

* info

* Just 4.9

* Fixes to support building on newer gradle versions

* Forward log output and run tests on runtime gradle version

* Remove travis

* De-duplicate

* Remove daily action, doesnt seem to work so well.
2020-06-08 15:19:11 +01:00
modmuss50
fdbdcc4bbf Fix #177 2020-06-02 14:29:20 +01:00
modmuss50
7e3c36159a Merge remote-tracking branch 'upstream/dev/0.4' into dev/0.4 2020-06-02 12:36:17 +01:00
modmuss50
6323137f56 update DLI 2020-06-02 12:35:55 +01:00
Fudge
4bf3d5aebe
Allow specifying additional decompilers for generating sources (#213)
* decompilers

* cleanup

* oops

* weird import

* public

* public 2 electric boogalo

* move over fabric specific

* ok

* move to api package
2020-06-01 19:31:32 +01:00