Commit Graph

756 Commits

Author SHA1 Message Date
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
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
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
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
b4f6874613 Fix race condition in asset downloading 2021-03-15 18:07:54 +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
shedaniel
f66548f7fb Update tiny remapper 2021-03-05 16:25:17 +08:00
shedaniel
ace2a412f2 Migrate to architectury tiny-remapper 2021-03-05 02:20:31 +08:00
shedaniel
11a665ed2e Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-03-01 00:45:34 +08:00
modmuss50
b1edf7a737 Fix inherit not copying ideConfigGenerated 2021-02-27 19:32:31 +00:00
shedaniel
8c0e612720 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
2021-02-27 17:43:24 +08:00
Shadowfacts
4540b3af33 Add log4jConfigs to Loom extension (#356)
Allows mod build scripts to specify custom Log4j config files that will
be combined together when running Minecraft in the dev-env. For example:

    loom {
        log4jConfigs.from "MyCustomConfig.xml"
    }

See: https://logging.apache.org/log4j/2.x/manual/configuration.html#CompositeConfiguration
2021-02-26 21:19:26 +00:00
shedaniel
dc73e7baa5 Add way to add new launch arguments, because this can change without regenerating the run configs. 2021-02-22 00:18:00 +08:00
shedaniel
2e2554d9cf Add debug logging to publication modification, remove log spam in asset downloading. 2021-02-21 21:58:11 +08:00
shedaniel
ce4a1cb2a3 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/Constants.java
2021-02-20 18:29:31 +08:00
modmuss50
57c9a8f320 Add loom dev deps to runtimeClasspath instead of runtimeOnly 2021-02-14 14:23:04 +00:00
modmuss50
46957df360 Run tests against gradle 7 and fail on deprecation. Fix gradle 8 support again. 2021-02-14 13:56:22 +00:00
shedaniel
e8800ec6ac Fix merge conflicts 2021-02-14 15:45:55 +08:00
shedaniel
021773f263 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftNativesProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
2021-02-14 15:42:50 +08:00
modmuss50
2070aeb94a Disable log4j jansi support when compiling, removes a warning about it. 2021-02-13 18:04:16 +00:00
Juuxel
dd440acb8e Add dev runtime dependencies to runtimeClasspath instead of runtimeOnly (#350)
This stops them from incorrectly showing up in Gradle module metadata
when a software component is used.
2021-02-13 16:53:44 +00:00
Juuxel
737c6cbd4f RunConfigSettings.generateIDEConfig -> ideConfigGenerated + normal getter/setter (#349) 2021-02-12 18:43:05 +00:00
modmuss50
da6a50d558 asm 9.1 2021-02-12 18:18:42 +00:00
modmuss50
0d1f40aee4 Rewrite minecraft game data handling.
Much faster asset and native validation logic.
Simplfied game metadata model.
2021-02-12 17:50:54 +00:00
modmuss50
24c166fc79 Generate IDE run configs on a per config basis. Allows for much finer grain control over what run configs are generated.
Defaults to generate all run configs on the root project.
2021-02-11 18:50:25 +00:00
modmuss50
6b481fbcd6 Revert previous change, somewhat. I didnt understand the issue correctly. 2021-02-11 18:32:01 +00:00
modmuss50
4daec03a0f Rename runs -> runConfigs 2021-02-11 18:18:07 +00:00
modmuss50
409f5f8e93 Update MCE - Remove auto population of minVersion in mixins - Drop some log levels. 2021-02-11 18:12:27 +00:00
shedaniel
17d60503f1 Publish to my maven 2021-02-09 09:25:22 +08:00
shedaniel
10686aaed9 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
2021-02-09 09:20:47 +08:00
shedaniel
b8e27f3d9b Allow post configuring run configs 2021-02-09 09:19:48 +08:00
modmuss50
b8058c693d Fix CME, Closes #345 2021-02-03 19:56:41 +00:00
shedaniel
9c6c6164fb Update README.md 2021-02-03 11:51:52 +08:00
shedaniel
20b016d652 Merge branch '0.6-merge' into dev/0.6-forge 2021-02-03 11:15:09 +08:00
shedaniel
799939d87f Merge remote-tracking branch 'FabricMC/dev/0.6' into 0.6-merge 2021-02-03 11:14:41 +08:00
shedaniel
db7340caf1 Create the data run 2021-02-03 11:14:21 +08:00
shedaniel
cbb00df99a Still takes about a minute to download all the assets, should be much better than 5 minutes. 2021-02-03 10:58:56 +08:00
Jason
671328795e Generate fabric.mod.json for included submodule jars (#343)
* Generate fabric.mod.json for included submodule jars

* Appease checkstyle
2021-02-02 23:03:57 +00:00
shedaniel
6b8188e688 Merge remote-tracking branch 'FabricMC/dev/0.6' into 0.6-merge
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
#	src/main/java/net/fabricmc/loom/task/LoomTasks.java
2021-02-02 15:32:02 +08:00
shedaniel
3f0c51324f Merge branch 'dev/0.6-forge' into 0.6-merge
# Conflicts:
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
2021-02-02 15:30:41 +08:00
shedaniel
157b902adc Fix source remapping for dependencies as well. 2021-02-02 15:19:03 +08:00
shedaniel
924378ebde Fix remap forge source jar to srg 2021-02-02 15:10:34 +08:00
shedaniel
0adcbbe253 Fix remap forge source jar to srg 2021-02-02 15:10:12 +08:00
shedaniel
32e5297de4 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-02-02 14:59:33 +08:00
modmuss50
5b3222e9b9 Rename mode -> environment + Hopefully fix a regression with the run tasks 2021-01-31 00:12:10 +00:00