Commit Graph

697 Commits

Author SHA1 Message Date
shedaniel
f9ba0104d1 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-30 10:06:21 +08:00
Username404-59
cc13624989 Workaround for FileSystemAlreadyExists errors (#17) 2021-04-30 00:38:27 +08:00
shedaniel
e05c885508 Change MavenConfiguration's forge maven 2021-04-29 20:12:18 +08:00
Username404-59
d276b4f19b Fix displayed forge version when using prefix-ranges in dev environments and fix the forge repo url too (#16)
* Fix displayed forge version when using prefix-ranges in dev environments

* Fix the forge repo url
2021-04-29 20:10:09 +08:00
modmuss50
974cd1fa6c Update MCE to 0.4.3 2021-04-28 22:50:53 +01:00
modmuss50
7de021e7c1 Revert "Update MCE"
This reverts commit b85659640d.
2021-04-27 18:04:47 +01:00
shedaniel
4c94886db8 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-27 20:55:19 +08:00
modmuss50
f409116afd Merge branch 'dev/0.7' of github.com:FabricMC/fabric-loom into dev/0.7 2021-04-27 13:13:15 +01:00
modmuss50
b85659640d Update MCE 2021-04-27 13:12:01 +01:00
ByMartrixX
1d009e155e Add loom development dependencies to test runtime classpath (#389) 2021-04-21 08:51:56 +01:00
shedaniel
b200c4ff62 Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forge 2021-04-17 22:38:11 +08:00
modmuss50
12ac6cfcfe Update mixin-compile-extensions 2021-04-14 20:45:17 +01:00
shedaniel
8f6de9af84 Add more logging to JarRemapper 2021-04-14 09:39:06 +08:00
shedaniel
aa009c2b2d Add "loom.forge.include" for include configuration on forge 2021-04-14 08:45:26 +08:00
shedaniel
e3a446965d Fix refmap remapping 2021-04-14 08:44:17 +08:00
shedaniel
ee847ba61b Add "loom.forge.include" for include configuration on forge 2021-04-14 08:40:11 +08:00
shedaniel
003574b9e8 Fix refmap remapping 2021-04-14 08:38:39 +08:00
shedaniel
e7530d489d Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-13 16:35:57 +08:00
shedaniel
cb821ede0f Revert "WIP AT -> JarProcessor"
This reverts commit 4fe9b81e
2021-04-13 16:31:15 +08:00
shedaniel
58d1b066bd Simplify RemapJarTask remapRefmap 2021-04-13 16:30:44 +08:00
shedaniel
361c84cf00 Simplify RemapJarTask remapRefmap 2021-04-13 16:27:14 +08:00
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
modmuss50
83eaa0e340 Update to run tests against gradle 7.0 release 2021-04-10 00:07:44 +01:00
modmuss50
816ed93d7a Fix typo 2021-04-09 20:44:18 +01:00
Devan-Kerman
d333ad16d2 fix maybe 2021-04-08 17:07:30 -05: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
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