Commit Graph

793 Commits

Author SHA1 Message Date
shedaniel
897806572e Fix merge conflicts 2021-04-13 16:22:58 +08:00
shedaniel
a0b84aaf17 Merge branch 'dev/0.6-forge' into dev/0.7-forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
2021-04-13 16:17:04 +08:00
shedaniel
61f724c76e Fix RemapSourcesJarTask defaulting to intermediary 2021-04-13 16:12:02 +08:00
shedaniel
f5c00d186b Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.6-forge 2021-04-13 16:05:34 +08:00
shedaniel
635fd8a55d Allow remapping to other namespaces 2021-04-13 16:05:26 +08:00
shedaniel
5eadada719 Merge pull request #13 from Devan-Kerman/dev/0.6-forge
allow mcp without params.csv to be used
2021-04-09 09:52:16 +08:00
Devan-Kerman
d333ad16d2 fix maybe 2021-04-08 17:07:30 -05:00
shedaniel
f45f47b1b0 Remove relocate 2021-04-04 21:54:47 +08:00
shedaniel
cd1d19afa7 Update tiny remapper 2021-04-04 21:54:07 +08:00
shedaniel
4fe9b81e32 WIP AT -> JarProcessor 2021-04-04 20:19:18 +08:00
shedaniel
6a25a40ff9 Publish 2021-04-04 20:19:09 +08:00
shedaniel
8c859ecba2 Fix merge conflicts 2021-04-04 19:44:11 +08:00
shedaniel
ad1754a932 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
#	src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java
#	src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java
#	src/test/groovy/net/fabricmc/loom/BuildUtils.groovy
2021-04-04 19:30:51 +08:00
shedaniel
8bf5870c7f Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
2021-04-04 19:21:23 +08:00
shedaniel
848c0e553e Rename log message to be less confusing 2021-04-04 19:17:34 +08:00
modmuss50
98731532d5 Support Groovy 3's QName in GroovyXmlUtil (#379) 2021-04-02 19:30:43 +01:00
modmuss50
93afc7574d Update UnpickTest to latest snapshot.
This ensures that constants included in the mc jar can be used.
2021-04-02 14:44:18 +01:00
modmuss50
153afc1418 Reorganise tests (#378) 2021-04-02 12:20:03 +01:00
modmuss50
ce19467121 Fix last commit, oops 2021-03-31 13:28:26 +01:00
modmuss50
a3c90aca19 Ensure output is deleted before remapping the game. 2021-03-31 13:14:24 +01:00
Octavia Togami
8a5467cdca Fix name comparision in GroovyXmlUtil (#373)
Nodes can also have groovy.xml.QNames, which need to be compared using
their matches(Object) method.
2021-03-29 12:45:38 +01:00
Octavia Togami
806dd1b840 Fix name comparision in GroovyXmlUtil (#373)
Nodes can also have groovy.xml.QNames, which need to be compared using
their matches(Object) method.
2021-03-29 08:48:52 +01:00
modmuss50
71535fa75f Add MavenProjectTest (#372) 2021-03-27 20:26:10 +00:00
modmuss50
ed08e47aab Record javadoc support. (#366)
* Record javadoc support

* Ensure we dont add JD twice
2021-03-25 22:58:20 +00:00
modmuss50
ff6701e817 Add basic groovy code style validation.
IDK how well this would work on a gradle script but might be interesting to try on yarn or something.
2021-03-25 22:57:28 +00:00
modmuss50
759cac2e6b Constant unpicking (#328)
* Start adding constant unpicking

* Update to use unpick cli

* Fix build?

* Fix?

* Fix log spam when unpicking

* Improve unpick tests
2021-03-25 19:03:35 +00:00
modmuss50
43a6b0f65f Revert some of the changes to genSource's.
More work is needed to fix all the issues with it but its not really something I want to get into right now.
2021-03-23 19:08:15 +00:00
modmuss50
c02f436123 Run tests against 7.0-rc-1 2021-03-23 08:51:41 +00:00
modmuss50
8e424f3f50 Try to cleanup files when failing better, should hopefully increase the changes of things working on a subsequent run.
Also improve the error message a little.
2021-03-18 22:00:06 +00:00
modmuss50
72a79ffb9c Fix case where it wont try to download file. 2021-03-18 14:39:30 +00:00
modmuss50
c033246a9f Add a strict mode when download files, will be a bit slower but should help solve some issues. 2021-03-18 14:38:29 +00:00
modmuss50
e6ac2afc7b Ensure outputs are reproducable across all OS's. (#363) 2021-03-15 23:31:18 +00:00
modmuss50
b4f6874613 Fix race condition in asset downloading 2021-03-15 18:07:54 +00:00
modmuss50
7231b9e053 Mod Remapping Refactor. (#362)
Improved gradle 7 support
General cleanup
2021-03-12 22:16:24 +00:00
shedaniel
f7ac507d67 Publish snapshot builds for wildcard 2021-03-09 20:43:40 +08:00
shedaniel
bcb55fe62f Fix @Shadow remap 2021-03-08 01:13:13 +08:00
shedaniel
bfcd0aa8c1 Use refmap-remapper to remap refmap to prevent double remapping 2021-03-08 00:59:47 +08:00
shedaniel
76e5b7131e Fix /inject/injection.jar not existing 2021-03-07 21:25:44 +08:00
shedaniel
11a39428c3 Fix build script 2021-03-07 20:59:13 +08:00
modmuss50
e9c7c21ede Add basic MultiProjectTest and a basic RunConfigTest
This should cover most of the main things now.
2021-03-06 23:31:09 +00:00
modmuss50
d1c4082761 Fix tests on windows 2021-03-06 17:36:12 +00:00
modmuss50
378b8850c6 Increase heapsize for tests 2021-03-06 15:57:58 +00:00
modmuss50
5171c9bbde Try and fix fernflower forking for the final time. Hopefully helps with #355 2021-03-06 14:07:37 +00:00
modmuss50
92efb9aa73 Fix ReproducibleBuildTest 2021-03-06 13:18:55 +00:00
modmuss50
87f3743b24 Rewrite tests to be easier to write and maintain (#361) 2021-03-06 11:40:07 +00:00
shedaniel
f66548f7fb Update tiny remapper 2021-03-05 16:25:17 +08:00
modmuss50
679026ef31 Minor cleanup/optimisations to downloading, should help a little bit more with asset downloading.
Closes #359
2021-03-04 23:50:02 +00:00
shedaniel
ace2a412f2 Migrate to architectury tiny-remapper 2021-03-05 02:20:31 +08:00
modmuss50
d02055eb23 Fix custom sourceset not being correctly set for runconfig tasks (#357) 2021-03-03 21:22:10 +00:00
modmuss50
b7eba8b093 Start 0.7 dev cycle 2021-03-03 21:20:37 +00:00