Commit Graph

446 Commits (17fb2b4656f8f78bc578b35f8285edb03789f4d1)

Author SHA1 Message Date
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
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
Jamie Mansfield 4eb699c2fb
Match Mercury sourceCompatibility with Gradle (#224)
* Match Mercury sourceCompatibility with Gradle

* Fix checkstyle
2020-07-16 18:17:50 +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 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
Reece Dunham 2baf39ad1c
Add descriptions to all the tasks (#214)
* Add descriptions to all the tasks

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Apply suggestions from code review - thanks @Juuxel!

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2020-06-01 19:08:17 +01:00
modmuss50 f529c6e01e Fix source remapping not having the full classpath 2020-06-01 12:25:10 +01:00
modmuss50 f673579da8 Cleanup and fix dep remapping, also add better log output to source remapping. 2020-06-01 12:17:58 +01:00
modmuss50 0265a756c4
Add an easy way to include fabric api modules (#183)
* Add an easy way to include fabric api modules

* Quick update

* Fix crash when reading empty aw file, fix -SNAPSHOT versions plugin marker not being published

* rename methods
2020-05-28 00:46:36 +01:00
modmuss50 5ae727612d Update lorenz-tiny to 2.0.0 2020-05-27 16:41:43 +01:00
modmuss50 2645fef789 Fix building on newer java versions 2020-05-27 14:38:45 +01:00
modmuss50 016645d315 Change compiler arg log output. 2020-05-22 15:36:03 +01:00
Fudge cf13e4aa02
Allow applying kapt and using mixins in other source sets (#211)
* Fix kapt and source sets

* cleanup

* cleanup 2
2020-05-22 14:38:25 +01:00
modmuss50 5d468efc48 Fix yet another Access Widener remapper bug 2020-05-14 02:21:52 +01:00
modmuss50 a36d7a20d4 Fix crash when reading empty aw file, fix -SNAPSHOT versions plugin marker not being published 2020-05-14 02:07:53 +01:00
Juuxel bf8dad499d
Move all Loom tasks to the "fabric" group (#199)
- cleanLoom: other -> fabric
- remapJar: other -> fabric
- Removed the "minecraftMapped" group that the run tasks were in:
  - runClient: minecraftMapped -> fabric
  - runServer: minecraftMapped -> fabric
2020-05-14 01:10:08 +01:00
modmuss50 7a56779368 Fix access widener remapping 2020-05-14 01:07:54 +01:00
modmuss50 11e24e57b4 Merge branch 'pull/205' into dev/0.4
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
2020-05-13 19:47:28 +01:00
Fudge c54ad10eee
Don't remapJar when running runClient or runServer (#207)
* Update LoomGradlePlugin.java

* Update LoomGradlePlugin.java

* ok jar then
2020-05-13 19:45:13 +01:00
modmuss50 3eff7d0fdb
Improve setup speed. (#208)
* Improve access widener remapper, now uses tiny remapper

* First pass on using the new tiny remapper

* Optimise source remapping
2020-05-13 19:44:45 +01:00
Juuxel bf6fb4a95e
Try to fix #187 (#198) 2020-05-11 23:32:12 +01:00
modmuss50 689293f52c Add a check to ensure the correct mc version is being used with the correct yarn version.
This only applies to yarn mappings as there isnt a solid way to do this for other mappings.
2020-05-11 13:20:12 +01:00
Joe add76e4949
Fix uninitialized property 2020-05-11 13:09:42 +01:00
Joe a134913c71
Allow other source sets to be remapped without needing an access widener 2020-05-11 12:48:04 +01:00
modmuss50 ac86ff1f29 Merge remote-tracking branch 'upstream/dev/0.4' into dev/0.4 2020-04-27 14:09:29 +01:00
modmuss50 76087d4d3d Some trivial performance improvements 2020-04-27 14:08:37 +01:00
immibis 6c02535304
Eclipse project fixes (#192)
* If the Eclipse project name is overridden by the build script, use the actual name.

* Clean up Eclipse launch files after cleanEclipse task.
2020-04-26 14:04:49 +01:00
modmuss50 3ce6fcd9a4 Update to use threaded fernflower 2020-04-24 13:36:50 +01:00
modmuss50 26755cb82c Ensure JarFile is always closed 2020-04-22 18:22:22 +01:00
modmuss50 f7190b31c0 Cleanup and fix dep aw remapping 2020-04-21 14:08:02 +01:00
modmuss50 c9282e0d6d Checkstyle fix 2020-04-11 19:29:51 +01:00
modmuss50 127e7a4330 Throw an exception if the target accessWidener could not be found in the fabric.mod.json 2020-04-11 19:21:54 +01:00
modmuss50 702e4ea80b Actually fix the issue 2020-04-07 00:12:50 +01:00
modmuss50 232118e69e Fix making constructors final 2020-04-06 22:52:49 +01:00
modmuss50 0ae8535c40
Access widener support (#182)
* Rough work on project based jars, skeleton for AccessEscalators?

* First working draft

* Minor changes

* Add support for mutable, better error checking when parsing file.
Code cleanup
Remap if needed when reading

* Fix inner classes and genSources

* Fix CME

* Caching, only regen jar when input changes

* Some work, untested

* Fix writing, fix checkstyle issues

* More fixes

* Move jars into a maven file structure, cleans up the file structure, and will benefit idea 2020
Add some basic validation to the AccessWidenerRemapper, will present any issues with the mappings when building (May need a way to disable?)
+ Some bugs fixes

* Fix issues with source jars in idea 2020, should be backwards compatible with 2019

* Move to lorenz-tiny

* Build fix + small cleanup

* Update to match the changes in loader

* More fixes

* Update to match loader changes.

* Improve error logging
2020-04-06 15:28:53 +01:00
modmuss50 75f08fc4c5 Cleanup potentially corrupt files on mappings error 2020-04-05 20:11:11 +01:00
modmuss50 e5a6551609 Small fixes to the log4j config file 2020-04-04 14:41:34 +01:00
modmuss50 dff10a5d79
Use a custom dev time log4j config. Enables color output and improves overall logging. (#186)
* Use a custom dev time log4j config. Enables color output and improves overall logging.
Color output is not enabled by default for eclipse users

* Use the run config to force enable ansi colors

* Improve IDE detection
2020-04-04 14:18:40 +01:00
modmuss50 bb68465a8d Add a basic way to specify custom intermediary URLs, ideally this would use maven.
But thats more work than I can be bothered to do.
2020-03-26 19:40:00 +00:00
modmuss50 00c65f54ed Fix https://github.com/FabricMC/fabric-example-mod/issues/44 2020-03-16 22:29:54 +00:00
modmuss50 ee462f8f9e
0.2.7 refactors (#178)
* Rough work on project based jars, skeleton for AccessEscalators?

* First working draft

* Minor changes

* Add support for mutable, better error checking when parsing file.
Code cleanup
Remap if needed when reading

* Fix inner classes and genSources

* Fix CME

* Caching, only regen jar when input changes

* Some work, untested

* Fix writing, fix checkstyle issues

* More fixes

* Move jars into a maven file structure, cleans up the file structure, and will benefit idea 2020
Add some basic validation to the AccessWidenerRemapper, will present any issues with the mappings when building (May need a way to disable?)
+ Some bugs fixes

* Fix issues with source jars in idea 2020, should be backwards compatible with 2019

* Move to lorenz-tiny

* Build fix + small cleanup

* Remove accesswidener's for now

* Update dev launch injector, should fix all issues with spaces in the path.
2020-03-06 11:15:34 +00:00
modmuss50 d62a63c8bd Possibly fix native downloading for older versions such as 1.8.9 2020-02-17 20:23:33 +00:00
modmuss50 a88087021b Make error messages more clear 2020-02-05 20:37:05 +00:00
modmuss50 6049ca48f4 Fix not always downloading version_manifest.json, can lead to missing versions 2020-02-05 20:20:43 +00:00
modmuss50 46b616af0f
Multithreaded asset downloading, should be a lot quicker (#175)
* Multithreaded asset downloading, should be a lot quicker

* Force the string width

* Limit threads to max 10 and min 1

* Use ConcurrentLinkedDeque
2020-01-29 15:23:13 +00:00
modmuss50 daf922d928 Performance optimisation when including nested jars 2020-01-24 21:59:59 +00:00
AlexIIL 77e32ba3fa Pretty-print fabric.mod.json. (#174) 2020-01-21 20:00:03 +00:00
Juuxel 045548a11d Replace dots in artifact names as well when generating mod jsons for JIJ (#173) 2020-01-18 17:23:33 +00:00
modmuss50 cd202f2804 Revert "Add mixins that target the class as a comment. (#168)"
This reverts commit fb3c2c86
2020-01-01 19:23:27 +00:00
modmuss50 fb3c2c86cb
Add mixins that target the class as a comment. (#168)
* Add mixins that target the class as a comment.

* some final fixes and tweaks

* Remove debug log

* Fix inner class mixins
2020-01-01 19:12:31 +00:00
Juuxel 705754de80 Change mixin refmap default name to use archivesBaseName instead of the project name (#158)
* Change mixin refmap default name to use archivesBaseName instead of the project name

Using the project name can be problematic in libraries pulled in with Jitpack.
Jitpack clones projects in a directory called "build", which sets the
project name to "build" if not manually defined. The resulting refmap,
"build-refmap.json", can conflict with other mods' refmaps,
leading to mixin crashes.

* Shut up checkstyle
2019-12-29 17:29:19 +00:00
modmuss50 5ef6125795 Fix eclipse run config, Closes #111 2019-12-27 21:17:37 +00:00
modmuss50 642ba74f8c Merge remote-tracking branch 'upstream/dev/0.2.7' into dev/0.2.7 2019-12-27 11:53:01 +00:00
modmuss50 4cf2b265eb Fix loom failing to find main class when in a loader dev env 2019-12-27 11:52:35 +00:00
Pyrofab 7a03264052 Make mod* work with non-empty classifiers again, fixes #162 (#163) 2019-12-20 20:28:37 +00:00
modmuss50 c2d61875e1 Yet another attempt to fix the annotation processor issue. 2019-12-13 18:24:01 +00:00
modmuss50 5c2b669bb5 Do not add fabric-mixin-compile-extensions when syncing in idea. 2019-12-11 15:52:08 +00:00
modmuss50 5baceb365a Revert last 2 commits. 2019-12-11 15:46:42 +00:00
modmuss50 cffb10a420 Another atempt to fix the annotation processors 2019-12-11 14:42:02 +00:00
modmuss50 dcbe6c4566 Possible fix/workaround for idea enabling annotation processors when we dont really need them. 2019-12-11 14:19:47 +00:00
modmuss50 c67206297e
Javadocs (#154)
* Javadocs

* Move to using IFabricJavadocProvider
Co-authored-by: mentlerd <mentlerd@gmail.com>

* Checkstyle
2019-12-02 13:32:10 +00:00
modmuss50 2f775b1c97 parameters docs
Co-authored-by: mentlerd <mentlerd@gmail.com>
2019-12-02 13:29:50 +00:00
Fudge 78f4983e61 Improve remapped artifact names (#153)
* improve artifact names

* fix indent

* fix indent again
2019-11-28 21:14:48 +00:00
modmuss50 414f41ab50 Merge remote-tracking branch 'upstream/dev/0.2.6' into dev/0.2.6 2019-11-18 22:14:55 +00:00
modmuss50 610cd82a78 Update mixin compile extensions 2019-11-18 22:14:49 +00:00
liach 2cc95daa71 Improve support for custom self-resolving mappings (#145)
Also allow mappings for 19w44a be used on 19w45b etc. with tinyv2

Signed-off-by: liach <liach@users.noreply.github.com>
2019-11-15 20:16:26 +00:00
Ramid Khan 55a9d90690 Allow for non-yarn mappings for MigrateMappingsTask (#141)
* Add getExtension utility method to AbstractLoomTask

* Support non-yarn mappings in MigrateMappingsTask

* Fix style

* Assume Yarn mappings if correct notation was not supplied

* Move load mappings block into its own its own method

Also added protected to getExtension on AbstractLoomTask

* Use Option instead of environment variables

* Assume V2 Yarn by default

* Some restructuring

All works the same.
2019-11-15 20:16:09 +00:00
modmuss50 11af956c84 Fix Linux/MacOS issues 2019-11-15 09:11:04 +00:00
Fudge 4ca20fb39e Allow source jars to use their own parameter names for mod deps (#147)
* formatting

* spaaaace
2019-11-13 12:32:44 +00:00
modmuss50 54ac2df5dc Real fix this time? 2019-11-13 09:19:57 +00:00
modmuss50 dda4291687 Fix build
Passes on my machine, but not jenkins
2019-11-13 09:16:27 +00:00
modmuss50 f8dd6f56ee Merge remote-tracking branch 'upstream/dev/0.2.6' into dev/0.2.6 2019-11-12 18:47:05 +00:00
modmuss50 e03bbe0f87 Cleanup installer json handling, should hopefully fix incorrect dependency versions. 2019-11-12 18:46:57 +00:00
modmuss50 b69d0db1c2
Use Dev Launch Injector to ensure that the launch options are always kept upto date. (#138)
* Generate pre-launch classes to set the run args and system property's
Will remove the need to regen the run configs each time the game is updated

* fix minor thing.

* Small cleanup

* Another small rename + remove testing code

* Remove import

* Add basic auto upgrade path, put the launch classes in a package

* Suggested cleanups

* Use dev-launch-wrapper

* Remove old classes

* Rename to dev-launch-injector

* Update more things I forgot about
2019-11-11 18:52:19 +00:00
liach c8ef934bda Add mixin ap to projects in a "better way" (#144)
* Add mixin ap to projects in a "better way"

Signed-off-by: liach <liach@users.noreply.github.com>

* Remove obsolete bad code

Signed-off-by: liach <liach@users.noreply.github.com>

* Use a field in constants instead

Signed-off-by: liach <liach@users.noreply.github.com>

* String format does not work

Signed-off-by: liach <liach@users.noreply.github.com>
2019-11-11 16:52:13 +00:00