Commit graph

338 commits

Author SHA1 Message Date
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
asie
e05aae6cd8 remove MixinDevRemapper, delete intermediary JAR before trying to create it 2018-11-02 09:02:19 +01:00
asie
060cdd8c2f pass fabricMappingFile to devenv 2018-11-02 00:44:31 +01:00
asie
226f237924 mixin refmap remapping support 2018-11-02 00:40:51 +01:00
asie
c38094ef3f obfuscate mixin methods/fields in output mod JARs 2018-11-01 22:15:51 +01:00
Adrian Siekierka
bd5d306a9a debloat, fix fabric-base 2018-11-01 12:15:09 +01:00
modmuss50
f32359d7c3 Fix building mods 2018-10-31 19:55:29 +00:00
modmuss50
79cfe6fbb3 Mod dev env fixes 2018-10-31 19:25:41 +00:00
Adrian Siekierka
0d2c97bf51 move JAR merging to Stitch 2018-10-31 18:18:42 +01:00
Adrian Siekierka
a99bee8f7c update libraries, switch to tiny-remapper as default 2018-10-31 15:23:50 +01:00
modmuss50
5ca71d9d15 Map mods to intermediary 2018-10-31 13:20:50 +00:00
modmuss50
cbdb516d5b Download pomf directly from maven, can be refactored to use maven correctly in the future 2018-10-30 11:45:27 +00:00
modmuss50
ec4bd3162a Added modCompile config to allow deps to be remapped 2018-10-29 11:55:30 +00:00
asie
da4d67cd3a net.fabricmc.base -> net.fabricmc.loader 2018-10-28 01:00:57 +02:00
Adrian Siekierka
2668cae022 allow using either Enigma or Tiny for remapping JAR 2018-10-27 18:20:29 +02:00
Adrian Siekierka
fdd4334a15 add license header 2018-10-27 16:14:05 +02:00
asie
708430e66e cleanup 2018-10-27 08:27:06 +02:00
modmuss50
8481ccc478 Remove some mixin prebaker stuff we no longer need 2018-10-27 00:06:51 +01:00
modmuss50
9a2b847772 Use tiny remapper to remap minecraft, some minor cleanup 2018-10-26 23:43:39 +01:00
modmuss50
90746a93c1 More name updates, should help in a few places 2018-10-25 12:40:41 +01:00
modmuss50
252b06bfc2 Revert to use fabric mod.json format 2018-10-25 12:32:39 +01:00
asie
5446a322d4 fix refmap generation 2018-10-25 11:51:01 +02:00
asie
2c5e50b5a3 ongoing de-OMLification 2018-10-24 22:07:18 +02:00
modmuss50
b2f78a3904 Update gradle + fix build 2018-10-22 19:53:07 +01:00
modmuss50
88315e4ccf Revert "Remove a bunch of stuff + update to support modlauncher"
This reverts commit 6b59f9c
2018-10-22 19:46:42 +01:00
modmuss50
337bb1392e Remove some fusion stuff we dont need 2018-10-22 19:35:44 +01:00
modmuss50
b8f0ec9d95 Revert to old name 2018-10-22 19:25:18 +01:00
TheCodedOne
6666738b92 Use deobf jar 2018-08-18 02:40:23 +01:00
TheCodedOne
76f94700ab Dont make different things for every damn OML version 2018-08-18 02:03:19 +01:00
TheCodedOne
bf07da6c30 Fix dev env 2018-08-18 02:00:48 +01:00