Commit Graph

599 Commits

Author SHA1 Message Date
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
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
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
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
shedaniel
056d46f4d4 Add MCP docs support and param names 2021-01-30 18:25:40 +08:00
shedaniel
1c144a55ca Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.6-forge 2021-01-30 16:47:25 +08:00
shedaniel
992bd180b0 Primitive MCP Support! 2021-01-30 16:47:17 +08:00
NinjaPhenix
20248dc805 Fixes refmap errors in sub-subprojects by replacing any subsequent : with a _. 2021-01-29 21:13:50 +00:00
shedaniel
751509af4a Mark useFabricMixin = true by default. 2021-01-30 02:26:39 +08:00
modmuss50
6a315be278 Improve run configs (#318) (#338)
Co-authored-by: ShadewRG <onankman@gmail.com>
Co-authored-by: UndeadCat | Shadew <redgalaxysw@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2021-01-29 18:04:39 +00:00
shedaniel
55436cfda0 Append platform suffix again 2021-01-30 01:50:23 +08:00
shedaniel
17fb2b4656 Cache the checksum of asset index files. (#335)
* Cache the checksum of asset index files.

* Resolve reviews
2021-01-29 15:38:46 +00:00
shedaniel
71392052eb Data Generator for Forge 2021-01-29 10:39:20 +08:00
modmuss50
48d4243be6 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6 2021-01-28 21:17:12 +00:00
modmuss50
c1fcd93a89 Dont add the mojang maven repo twice.
Might speed some things up as well due to ordering
2021-01-28 21:16:56 +00:00
Bytzo
16f72e1c95 Set classpath before compileJava task (#330) (#333) 2021-01-26 18:08:19 +00:00
shedaniel
b880d3f9d5 Don't add tasks before run to idea anymore for arch 2021-01-26 11:34:52 +08:00
Chocohead
ba3a1e4d9c Use the given manifest version hash if possible (#337) 2021-01-24 14:39:52 +00:00
shedaniel
10f5eb0612 fix mixinConfig 2021-01-24 20:11:49 +08:00
shedaniel
ed9100c418 Deprecate mixinConfig in favor of mixinConfig method to add to the list 2021-01-24 18:32:40 +08:00
shedaniel
dfb5f5dd83 Update fabric mixin, fix #3, reduce logger spam 2021-01-24 18:32:17 +08:00
modmuss50
f7efac5d18 Revert previous attempt at fixing genSources when loom is applied via buildSrc 2021-01-21 21:47:32 +00:00
modmuss50
34a9d2316c Improve error handling around access widener remapping. Closes #311 2021-01-21 20:30:08 +00:00
modmuss50
d91b722c35 Another attempt at fixing issues with fernflower's classpath 2021-01-21 20:09:48 +00:00
modmuss50
4a30993da7 Apply all buildscript configurations across all parent projects to try and fix fernflower classpath issues again.
If you have any better suggestions please let me know.
2021-01-21 19:40:59 +00:00
shedaniel
d7ea6fc0d1 Override minVersion for dependencies. 2021-01-21 19:43:32 +08:00
shedaniel
61ac660435 Auto generate vscode run configurations, inject our own pre launch tasks to tasks.json 2021-01-20 22:51:15 +08:00
shedaniel
ba3735c68e Allow configuring additional local sourceSets. 2021-01-20 20:00:06 +08:00
shedaniel
c57b28e5b6 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge 2021-01-20 14:48:07 +08:00
modmuss50
b622544cbe Dont remap dependency sources when building on CI services.
Use `-Dfabric.loom.ci=false` to force disable
2021-01-19 22:15:23 +00:00