Commit Graph

367 Commits (6323137f5641993c456c5f56a8053481731c9987)

Author SHA1 Message Date
modmuss50 3e4ade38a7 Merge branch 'pull/110' into dev/0.2.5
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/net/fabricmc/loom/util/MixinRefmapHelper.java
2019-06-24 11:17:45 +01:00
modmuss50 9f0cdbf1a4 Start work on 0.2.5, update to gradle 5.5-rc-3 2019-06-24 11:13:47 +01:00
Mitchell Skaggs d5dad70de5
Update Gradle wrapper and make tests use older Gradle version to test compatibility 2019-06-16 13:31:58 -05:00
Mitchell Skaggs ba6e435970
Add currently broken and disabled mixin build test 2019-06-15 20:23:55 -05:00
Mitchell Skaggs c0a58d1bc7
Add simple build functional test 2019-06-15 16:28:37 -05:00
Mitchell Skaggs 52814a5b7b
Extract file generation from functional tests 2019-06-12 17:14:44 -05:00
Mitchell Skaggs 6376d197c6
Fix unused and broken imports in MixinRefmapHelper 2019-06-12 17:13:55 -05:00
Mitchell Skaggs 69df7ed774
Add simple integration tests for the plugin 2019-06-10 22:22:18 -05:00
Mitchell Skaggs 9e690f489f
Refactor RemapJarTask to extend from Jar
It may now be used in places that require AbstractArchiveTask such as Maven publications
2019-06-10 22:22:16 -05:00
asie a12fd8e6eb fix remapped mods not including yarn minecraft version 2019-06-07 22:17:40 +02:00
Mitchell Skaggs 11246870fa Replace existing/duplicate nested jars (#106) 2019-06-07 10:24:36 +02:00
modmuss50 565d01b7c4 Fix license violations 2019-05-28 12:38:59 +01:00
asie 754c061e2b add modApi, modImplementation, modRuntimeOnly; try to improve source remapping performance 2019-05-28 09:23:27 +02:00
asie 393ced01b3 use mappings name in MinecraftMappedProvider 2019-05-27 22:23:24 +02:00
Pyrofab 467b696393 Make modCompile work with non-empty jar classifiers, fixes #82 (#96) 2019-05-27 22:18:19 +02:00
SquidDev ae5beb0326 Depend on assemble rather than buildNeeded (#94)
This means test suites are not run before starting Minecraft.
2019-05-27 22:17:38 +02:00
Dinolek aa3f1da1be Change Minecraft_*.launch to projectname_*.launch for genEclipseRuns (#93) 2019-05-27 22:16:44 +02:00
asie 4134c7ef50 pull in annotationProcessor dependencies from fabric-loader JSON too 2019-05-27 22:14:35 +02:00
asie 89d207d06b remove hacky mixin refmap remapper 2019-05-27 22:01:30 +02:00
modmuss50 e73febd7f4 Possible fix for #68 2019-05-26 16:02:35 +01:00
asie 4be5fe010f use compileClasspath to remap JARs 2019-05-18 11:51:34 +02:00
Adrian Siekierka 3d21ce811b fix DownloadUtil not downloading file if ETag present, but file is not 2019-05-17 12:59:40 +02:00
Adrian Siekierka 38c395b2e7 remapJar should, by default, add nested dependencies 2019-05-11 18:38:01 +02:00
asie 788df9cfc7 migrate RemapJarTask and RemapSourcesJarTask over to getters/setters for fields; make RemapJarTask use input and output locations instead of in-place renaming fluff 2019-05-11 00:53:50 +02:00
asie 1c56fb2eda updateMappings -> migrateMappings, new features 2019-05-10 13:55:17 +02:00
asie 64c21c01b8 add updateMappings task 2019-05-10 13:32:11 +02:00
asie eff108344f refactor genSources into multiple reusable tasks 2019-05-10 11:48:15 +02:00
modmuss50 7e59a90463 Fix remap jar not always running on subsequent builds 2019-05-06 11:34:45 +01:00
Chocohead 1dd8e47122 Avoid trying to download things offline (#87) 2019-05-01 21:30:50 +02:00
Adrian Siekierka 88796b3c0f migrate away fabric-mixin-compile-extensions, fix root/sub project issues wrt mixin/loom presence hopefully once and for all 2019-04-30 00:43:26 +02:00
Adrian Siekierka 17b8aa7a70 fix #85, remove parts of deprecated code, update Mixin 2019-04-27 22:31:50 +02:00
Dinolek 2b4d9fd3bc eclipse wants run dir too (#84) 2019-04-27 18:45:07 +01:00
Adrian Siekierka f768f9316e cease loading the same mappings file a million times 2019-04-24 19:32:35 +02:00
Adrian Siekierka b5b3138e24 fix line number remapping, add option to disable mixin refmap remapping (unnecessary in loader 0.4.0+, but needs testting) 2019-04-23 22:50:39 +02:00
Adrian Siekierka b4beaed968 make modCompile() transitive 2019-04-22 13:41:16 +02:00
Adrian Siekierka b37079c931 backport FernFlowerTask and relevant systems from 0.3 2019-04-22 13:40:59 +02:00
Adrian Siekierka 3094d70731 apply nested JAR dependencies to every remapJar task which nests 2019-04-22 01:25:03 +02:00
Adrian Siekierka 7c25b0399c fix nestJar option default in RemapJar 2019-04-22 01:16:56 +02:00
Adrian Siekierka 6a7a00c426 add toggle to disable jar nesting in RemapJar tasks 2019-04-22 00:41:28 +02:00
Adrian Siekierka 221fcf2f51 migrate to try-with-resources 2019-04-22 00:39:09 +02:00
Adrian Siekierka 253c2ed15e support appending to existing <dependencies> keys in maven-publish hook; in came a buildscript uses .withXml, say 2019-04-21 23:50:35 +02:00
Adrian Siekierka dc69315715
add correct Maven dependencies to maven-publish mod POMs (#79) 2019-04-21 18:42:51 +02:00
asie 9a33598608 remapped mods need to persist after a clean to allow "clean build" to work 2019-04-21 14:39:51 +02:00
Adrian Siekierka 07ab36a97d fix IDE generation file paths assuming CWD == project root, close #72 2019-04-21 11:48:00 +02:00
Adrian Siekierka bed0bba2da update tiny-remapper, Mixin 2019-04-21 11:37:35 +02:00
Adrian Siekierka bcae78333d rewrite source remapper to use tiny-mappings-parser 2019-04-21 11:29:19 +02:00
Adrian Siekierka ab9d2d3fda store mixin maps in per-project build caches, move root project build cache to build/loom-cache from .gradle/ 2019-04-21 11:18:45 +02:00
Adrian Siekierka 988c7e483d fix unnecessary pointless LoomFernflowerDecompiler warnings 2019-04-20 23:31:52 +02:00
modmuss50 a97bb32210 Download assets when idea is syncing a project 2019-04-20 19:11:39 +01:00
Adrian Siekierka 085021dcbb update libraries; move asset downloading to task that does not run on every build, but only when it is required (runClient and IDEs) 2019-04-20 20:56:05 +02:00
Chocohead 03fb478166 Remap less (#77)
* Avoid remapping jars every time Loom starts

* Attempt to find installer JSON if it isn't found

Remapping Fabric-Loader used to find it every time, now we might skip that we have to go looking for it

* Log a little more when skipping things

Makes it more clear cut when it is avoiding doing things compared to failing after trying
2019-04-20 18:47:32 +01:00
Chocohead a55ebd4e31 Download less each run (#73)
* Drastically reduce the amount of downloading Loom does

Uses ETags and last modify times to avoid downloading the version manifests, the game jars and assets

* Documentation is good

* Avoid string concatenation with debug off
2019-04-19 19:15:48 +01:00
Chocohead e72ccc104c Enhance support for file modCompiles (#74)
* Enhance support for file dependencies

There's a reasonable chance this might work now, at least more than it did before

* Encourage Gradle to search better

Now it will find both remapped maveny and file dependencies

* Remove some very quiet boxing

Didn't think javac is capable of noticing that
2019-04-19 19:14:58 +01:00
modmuss50 e49af8ac39 Fix crash when parent project does not have loom 2019-04-15 09:12:48 +01:00
modmuss50 c9aaa68e5f Attempt to look in the root project for the loom version if required 2019-04-14 19:08:26 +01:00
modmuss50 60ec4c1fdb Fix broken assetIndex with versions with spaces 2019-04-11 18:58:40 +01:00
modmuss50 9eb9978390 Include loader's basic version parser, adds support for new yarn version separator 2019-04-10 17:35:38 +01:00
copygirl 26c548195e Fix VS Code launching in wrong folder (#66)
It appears that a backslash in the working directory (in "launch.json") is not correctly handled by the Java launcher or so, causing the game to run in the workspace folder instead of "run".
2019-04-09 14:36:54 +01:00
modmuss50 e1267680f2 Generate a barebones mod.json for libraries 2019-04-08 11:24:12 +01:00
modmuss50 f672b815c4 Dont expand out nested jars can be enabled if wanted. Will still strip the jars from the mod json 2019-04-08 10:50:30 +01:00
modmuss50 0206a4c59b Strip the contained jars from the mod meta data 2019-04-07 22:40:44 +01:00
modmuss50 36750634eb Merge remote-tracking branch 'remotes/origin/dev/0.2' into dev/0.2.1 2019-04-07 20:44:10 +01:00
Adrian Siekierka cc05052fcb tweak mixin json findin heuristic 2019-04-07 22:39:08 +02:00
modmuss50 4b9db57aaa Make the sub project requirement a bit more intelligent, no longer blindly depends on all sub projects. 2019-04-07 20:38:10 +01:00
modmuss50 0d92da79c6 No longer auto apply evaluationDependsOnChildren, this can easily be done on a per mod basis 2019-04-07 20:32:39 +01:00
modmuss50 6f35014805 Extract nested jars from modCompile 2019-04-07 20:31:25 +01:00
modmuss50 02e9616622 Start on 0.2.1 2019-04-07 15:18:11 +01:00
Adrian Siekierka c452b3ae8a update libraries 2019-04-07 13:33:48 +02:00
modmuss50 c43e771ef5 Only generate the run configs on the root project 2019-03-30 20:08:25 +00:00
Adrian Siekierka 21c31307c4 update Mixin, Stitch 2019-02-01 22:28:36 +01:00
Virtuoel 2ad6057992 Add working directory to Eclipse run config (#55) 2019-01-29 08:47:11 -05:00
Adrian Siekierka 5361c3d6f6 support dashes as mapping version separator 2019-01-24 17:59:23 +01:00
Falkreon 22507be8da Don't overwrite information set in RemapJar configure blocks after configure (#52) 2019-01-09 21:13:35 +00:00
modmuss50 a6507ef7a1 Fix another locked file, only a minor one this time 2019-01-04 20:27:27 +00:00
asie 32f3d924b0 fix JAR remapping 2018-12-31 14:37:47 +01:00
asie e038abcb8e more gradle fixes 2018-12-31 00:42:49 +01:00
asie 6749c9688e fix gradle 5 support changes 2018-12-30 23:26:50 +01:00
Adrian Siekierka 0dcb7070be warn about refmap name after fields are populated, might help some things 2018-12-30 12:04:53 +01:00
Adrian Siekierka 6a77b5deaa gradle 5.0 support, fix #38 2018-12-30 12:03:25 +01:00
Adrian Siekierka da03fd2827 apply terrible workaround for source remapper/JDT? bug (Mercury devs notified) 2018-12-28 22:08:36 +01:00
asie cd54faba44 fix runtask rundir 2018-12-23 21:43:22 +01:00
asie d4ae5e9b72 fix #48 2018-12-23 19:37:09 +01:00
asie 0b38f3ecc5 use more reliable renamer, update Stitch - fix #46 2018-12-23 19:18:40 +01:00
asie 4700788ead fix #47 2018-12-23 09:37:54 +01:00
modmuss50 8d326da8be Close jar when no fabric-installer.json found 2018-12-22 22:19:26 +00:00
Adrian Siekierka 4c625b45bc fix licenseFormat 2018-12-22 21:27:46 +01:00
therealfarfetchd 58512f2f47 Put tasks in 'fabric' group 2018-12-22 17:06:18 +01:00
Adrian Siekierka baaf430fd8 mark Loom 0.2.0, update Mixin library 2018-12-22 15:46:58 +01:00
Adrian Siekierka a39d0b6656 add cleanLoomMappings, close #36 2018-12-22 15:35:36 +01:00
Adrian Siekierka d9b8c90b5f working source code remapping for mod dependencies 2018-12-22 15:29:46 +01:00
Adrian Siekierka 530896e41a make modCompile use flat directory artifact location instead of hack 2018-12-22 14:44:34 +01:00
Adrian Siekierka a620812aab build functional intermediary-mapped sources JARs; update Stitch 2018-12-22 14:37:16 +01:00
modmuss50 2b85714448 Very early source remapping 2018-12-22 10:31:30 +01:00
Adrian Siekierka 79ec748a12 parse fabric-installer.json for mod devenvs, add loaderLaunchMethod param for that purpose, tweak LineNumberAdjustmentVisitor 2018-12-22 10:31:10 +01:00
asie 1445b8240a update dependencies, remap LVTs when mapping JAR 2018-12-20 12:32:02 +01:00
modmuss50 4731589579 Default idea's run config (when importing with idea's gradle tools) to use the _main module. Not a perfect fix but will now work with the default import settings. 2018-12-19 23:06:06 +00:00
modmuss50 278c8d2401 Add a way to disable IDE run config auto generation. (Only applys when importing with idea's gradle tools) 2018-12-19 23:05:19 +00:00
asie e93292564d fix #26 2018-12-17 15:05:52 +01:00
asie 5c7c94e5fc fix #37 2018-12-15 22:19:50 +01:00
asie 83d6a2da42 add minVersion filling support - fix #34 2018-12-15 14:33:25 +01:00
asie fe194ea64d use resolved dependency version for mapping files 2018-12-15 14:14:50 +01:00
asie ad4e6fd6ff fix #20 2018-12-13 09:50:01 +01:00
modmuss50 f875e34a67 Only add -XstartOnFirstThread on mac os 2018-12-12 18:10:47 +00:00
modmuss50 a2fc5ddf9c Merge branch 'start-on-first-thread' of https://github.com/shadowfacts/fabric-loom into shadowfacts-start-on-first-thread 2018-12-12 13:44:42 +00:00
modmuss50 96e0dd30be Auto generate eclipse launch files 2018-12-12 13:43:42 +00:00
asie f61b06f616 add some debug code for refmap issue 2018-12-12 07:16:01 +01:00
asie b00b42e3bf fix #28 2018-12-12 07:10:30 +01:00
David Vierra a6c3406ba5 runClient and runServer now respect the jvmArgs property 2018-12-11 14:05:12 -10:00
Sander de Goeij 8544e64033 Fix a typo in launch.json generation 2018-12-11 13:25:48 +01:00
Shadowfacts 8a0c05eadb
Add -XstartOnFirstThread, required when running on macOS 2018-12-10 20:47:02 -05:00
modmuss50 f8bcf214f8 use project root dir, should fix files being all over the place 2018-12-10 14:28:58 +00:00
Adrian Siekierka da675e9545 clean mapping provider code 2018-12-09 22:22:35 +01:00
asie 72a0375696 clean up Maven repositories 2018-12-09 08:21:32 +01:00
asie c6c88e69de update Stitch, add CleanLoomBiaries 2018-12-08 13:40:02 +01:00
modmuss50 43d3a46296 Use pomf jar, and don't override run configs 2018-12-04 20:20:22 +00:00
asie f9d0c39601 enable rebuildSourceFilenames 2018-12-02 02:20:18 +01:00
modmuss50 3766182f93 Added vscode task to generate launch.json
A few plugins will make the experience a lot better:
https://marketplace.visualstudio.com/items?itemName=redhat.java
https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-debug
https://marketplace.visualstudio.com/items?itemName=vscjava.vscode-java-pack
2018-12-01 17:04:15 +00:00
modmuss50 64e052cf25 Clean up GenIdeaProject, fixes run args not being updated 2018-12-01 16:08:52 +00:00
Adrian Siekierka daaccc87f2 download minecraft libraries through maven 2018-12-01 11:03:25 +01:00
Adrian Siekierka 836b321107 switch to fernflower, add line number remapping 2018-12-01 10:52:17 +01:00
Adrian Siekierka e41e3e532a add sources generation, update guava 2018-11-30 21:16:42 +01:00
modmuss50 37c5b2c913 Fix minecraft version json having a jar extension 2018-11-28 11:51:09 +00:00
asie e0972e5349 update stitch, fix error when mappings partially present 2018-11-21 18:33:25 +01:00
asie b1d5bd0536 add field name population on mapping download 2018-11-21 09:03:56 +01:00
asie 823854f2a1 update tiny-remapper 2018-11-12 01:25:06 +01:00
asie 24b1b0669d do not try closing twice in ModProcessor 2018-11-12 00:35:12 +01:00
asie dbaba22207 fix try...catch segments not closing files in some cases 2018-11-12 00:17:44 +01:00
asie cffd468b68 clean up RemapJar, add automatic mixin refmap name fill-in 2018-11-06 10:36:35 +01:00
modmuss50 1fae916384 fix run client, fix needed as it now runs in a named env 2018-11-05 22:15:00 +00:00
modmuss50 c5a19955ff New experimental way of remapping mods, this may not stay 2018-11-05 20:33:57 +00:00
modmuss50 94c7137086 Split mappings and minecraft 2018-11-05 15:54:14 +00:00
asie 8e3822dec7 fix AP not being present on classpath 2018-11-05 14:57:43 +01:00
asie 1691c8c2d8 use one asset directory 2018-11-05 14:44:52 +01:00
modmuss50 10f134fcc2 Only remap jars when required 2018-11-05 12:07:03 +00:00
modmuss50 9ed5dd7a01 Generate idea run configs for dir based projects 2018-11-05 12:00:54 +00:00
modmuss50 9d03783792 2 small fixes 2018-11-05 10:57:29 +00:00
asie b6779a6ec0 fix library transitiveness 2018-11-05 10:40:34 +01:00
modmuss50 d0e649766b Change some stuff in hope that it helps things 2018-11-04 21:28:46 +00:00
modmuss50 bbf5e341e3 Fix some streams not being closed, clean up the mod reobfuscater, fix runClient task 2018-11-04 18:46:37 +00:00
NikkyAI 40f9168b6a disable shading and small other fixes (#12)
* make Project in LoomGradleExtension private

* use gradle all distribution

* disable shading
2018-11-04 00:27:55 +00:00
modmuss50 0a5245d508 Revert "Fix some streams not being closed, clean up the mod reobfuscater, fix runClient task"
This reverts commit 30a71c1
2018-11-03 18:44:31 +00:00
modmuss50 3a6a4f4056 Log version 2018-11-03 18:03:43 +00:00
modmuss50 0770c57d6d Revert "Fix remapped mods not being resolved by the ide"
This reverts commit 356a7c4
2018-11-03 17:24:16 +00:00
modmuss50 ecd512c54d Merge remote-tracking branch 'origin/dev' into dev 2018-11-03 13:51:07 +00:00
modmuss50 30a71c133d Fix some streams not being closed, clean up the mod reobfuscater, fix runClient task 2018-11-03 13:50:57 +00:00
NikkyAI b3a5f4ebd7 add gradle plugin marker (#11)
format build.gradle
format


do tabs
2018-11-03 13:01:34 +00:00
modmuss50 356a7c4d00 Fix remapped mods not being resolved by the ide 2018-11-03 12:59:37 +00:00
asie d908e4129c fabric-base -> fabric-loader 2018-11-02 21:16:14 +01:00
Adrian Siekierka dff255da68 rename mapping headers 2018-11-02 17:19:57 +01:00
Adrian Siekierka 6b17d207d5 fix mod compilation 2018-11-02 10:33:03 +01:00