Commit Graph

306 Commits (5a16440c1efec12870953e369f0f481d37c16b23)

Author SHA1 Message Date
asie 3c7d6fd87f caching/performance improvements 2019-07-24 23:04:45 +02:00
asie ac9c7fc103 downgrade to gradle 4.9, fix tiny-remapper deprecations, restore old dev/noclassifier behaviour for default RemapJarTask settings 2019-07-24 22:34:27 +02:00
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 6376d197c6
Fix unused and broken imports in MixinRefmapHelper 2019-06-12 17:13:55 -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
Pyrofab 467b696393 Make modCompile work with non-empty jar classifiers, fixes #82 (#96) 2019-05-27 22:18:19 +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
Adrian Siekierka 3d21ce811b fix DownloadUtil not downloading file if ETag present, but file is not 2019-05-17 12:59:40 +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 eff108344f refactor genSources into multiple reusable tasks 2019-05-10 11:48:15 +02: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
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 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
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
modmuss50 a97bb32210 Download assets when idea is syncing a project 2019-04-20 19:11:39 +01: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 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
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 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
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 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 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 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
asie e93292564d fix #26 2018-12-17 15:05:52 +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
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
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
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 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 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
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
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 0770c57d6d Revert "Fix remapped mods not being resolved by the ide"
This reverts commit 356a7c4
2018-11-03 17:24:16 +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
modmuss50 356a7c4d00 Fix remapped mods not being resolved by the ide 2018-11-03 12:59:37 +00: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 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
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 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
TheCodedOne 76f94700ab Dont make different things for every damn OML version 2018-08-18 02:03:19 +01:00
modmuss50 856e8b5c1f
Mixin remapper + fixes. Now runs on notch names 2018-08-07 18:52:17 +01:00
modmuss50 dffcc5a9d8
Fix OML building 2018-08-07 15:56:39 +01:00
modmuss50 18dfa2cdb2
Fix crash, as we no longer have special mappings for the mixins, something will need to be done about this however, but it will most likey be at runtime 2018-08-05 22:16:52 +01:00
modmuss50 6b59f9cc59
Remove a bunch of stuff + update to support modlauncher 2018-08-05 21:45:54 +01:00
modmuss50 9e4012571a
Lets get it working, and then write clean code 2018-06-19 11:04:39 +01:00
modmuss50 1893966038
throw an error if a jar is missing 2018-06-18 17:01:39 +01:00
modmuss50 69f15e870c
Ensure file is moved 2018-06-18 16:55:51 +01:00
modmuss50 cc23189335
Small tweaks 2018-06-18 16:41:50 +01:00
modmuss50 527000ed24
Inital work on getting the prebaker to work, still very broken but things have worked 2018-06-18 16:16:03 +01:00
modmuss50 d13f33d0f3 Inital work on mixin prebaker, old code taken from fabric-base 2018-05-15 11:54:40 +01:00
modmuss50 55c6018bff Update to gradle 4.7 2018-05-14 11:20:19 +01:00
modmuss50 a9dfbde6d4 Revert 3857631498 2018-05-14 11:17:26 +01:00
TheCodedOne bd7dfab919 Move user cache 2018-05-13 02:43:40 +01:00
modmuss50 3857631498
Remove all mixin related code 2017-05-12 20:17:21 +01:00
modmuss50 6dbe4d7271
Fix NPE when downloading libs. 2017-04-05 13:23:06 +01:00
modmuss50 29631ad1bb
Fix crash when resolving libs of new snapshot. 2017-03-31 12:27:55 +01:00
modmuss50 673f21c506
Add the ability to use custom mapping files. 2017-02-10 13:14:46 +00:00
modmuss50 2eaae5be44
Allow running without a POMF version set, and remove cyclic dep of fabric base to allow building for now. 2017-02-09 18:21:42 +00:00
lclc98 017a7a3688 Fixed Deobf Typo (#8) 2016-11-16 21:03:54 +00:00
modmuss50 a6ce8cfd9d Update to use my jenkins 2016-11-16 20:59:20 +00:00
modmuss50 dd6b229dc5
Set defaultObfuscationEnv, and potentially fix mixin mappings not being applied. 2016-10-24 16:14:17 +01:00
modmuss50 e274d0c8c5
Improve mod re-mapper 2016-10-23 17:31:56 +01:00
modmuss50 9f959ef04d
Fix mod obof, and add property to specify refmapName 2016-10-20 16:55:46 +01:00
asiekierka 14fb337330 work on refmap inclusion, mixin applying 2016-10-16 11:49:16 +02:00
asiekierka f2933cb818 feed tinymapping file to MixinPrebaker 2016-10-14 21:52:54 +02:00
asiekierka ca963664e6 add partially working mixin remap 2016-10-12 20:02:14 +02:00
modmuss50 3ebbd9463c
Initial untested support for mixin remapping 2016-10-12 15:34:04 +01:00
modmuss50 68cd938036
Fix file not found with remapper 2016-10-12 11:08:12 +01:00
modmuss50 b43793b3fc
Initial untested work on mod remapping 2016-10-12 10:44:31 +01:00
modmuss50 85d51cb1a1
Remove need to use genIdeaRuns, now just use the idea task
Remove making everything public - breaks a lot of shit
2016-10-12 10:22:08 +01:00
modmuss50 22f1743a08
Fix mixin pre-baker 2016-10-09 13:18:00 +01:00
modmuss50 3f24ce0289
Initial work on pre baking mixins
Downloading of fabric base + deps needs fixing, I may do it a different way.

This is mainly moving pc commit as a lot of stuff here isn't final.
2016-10-07 13:17:04 +01:00
modmuss50 5e18df32a5 Initial work on remapping mixins 2016-09-28 16:51:31 +01:00
modmuss50 91708d4475 pomfVersion 2016-09-10 15:26:24 +01:00
modmuss50 ab0b8fd09f Rename pomf to pomf_build 2016-09-10 13:15:27 +01:00
modmuss50 5da73c87f8 Use pomf releases, build against gradle 3 2016-09-10 13:09:15 +01:00
modmuss50 31583ce44b Minecraft jars are stored in the project folder 2016-08-28 12:00:58 +01:00
modmuss50 3eb9b77746 Now stores files in the user gradle folder, will prevent downloading assets for each project 2016-08-25 12:42:23 +01:00
modmuss50 65e2a76d70 Jar merging + reformat 2016-08-17 17:38:54 +01:00
Shadowfacts 00382284fe
Update IDEA run configuration generation 2016-08-17 10:45:04 -04:00
modmuss50 c89344527b Load project deps from within gradle, should allow moduals to be built 2016-08-17 00:30:48 +01:00