Commit Graph

187 Commits

Author SHA1 Message Date
Juuz
5a3864ac8d Update forge runtime to 1.1.6 2023-04-20 22:29:25 +03:00
Juuz
0afa1ee8ba Update forge runtime to 1.1.5 2023-04-20 22:03:30 +03:00
Juuz
9e041899ae Merge with Fabric 1.1, stage 9 2023-02-16 21:03:55 +02:00
Juuz
1d6d7b5489 Merge commit 'af21d602' into exp/1.1 2023-02-16 20:46:17 +02:00
Juuz
db8ef472cc Merge with Fabric 1.1, stage 5 2023-02-16 20:45:08 +02:00
Juuz
0314829e26 Merge with Fabric 1.1, stage 3 2023-02-16 01:02:58 +02:00
Juuz
3bae7bf8b0 Update forge runtime to 1.1.4 2023-02-07 19:48:42 +02:00
modmuss50
5094a8af86 Update MCE (#818) 2023-01-24 10:54:37 +00:00
modmuss50
b22c66f0be Update dependencies 2023-01-22 13:34:28 +00:00
Juuz
cf68a6eb1e Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0 2023-01-16 19:56:25 +02:00
modmuss50
69d25b7f60 Include projects in jar processor inputs (#771)
* Include projects in jar processor inputs

* Add option to disable + tests
2022-12-30 15:09:30 +00:00
modmuss50
b79b64298b Update mercury (#777) 2022-12-18 15:59:53 +00:00
modmuss50
e16d9b0fa2 Update mercury, use the java release version to set the merucry source compat version (#773) 2022-12-16 10:48:58 +00:00
modmuss50
f87320fae8 Add multi project optimisation option to allow opt into shared tiny remapper. (#747)
* Add multi project optimisation option to allow opting into shared tiny remapper.

* Review feedback and fixes
2022-11-01 21:36:41 +00:00
Juuz
8d54df26ca Remove LaunchProviderSettings (#103)
* Remove LaunchProviderSettings

Closes #99.

- Added new RunConfigSettings.forgeTemplate API
- Removed LaunchProviderSettings and loom.launches
- Removed most evaluateLater usages, only used for configuring the
  RunConfigSettings since Forge runs aren't resolved yet when they're
  created
- Didn't migrate Forge userdev stuff to runs, most of it still injects
  directly into DLI

* Fix Fabric

* Fix 1.14 - 1.16.5 Forge, add test for ForgeRunTemplate for those versions

* Move ConfigValue out of mcpconfig, clean up

* Add test for config values

* Stop replacing user config values with ours
2022-10-29 14:21:50 +03:00
Juuz
c5386d8795 Merge with Fabric 0.13, stage 5 2022-08-09 17:37:04 +03:00
Juuz
56995fd210 Merge with Fabric 0.13, stage 2 2022-08-09 17:25:34 +03:00
Juuz
549fd9c930 Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
2022-07-07 11:04:31 +03:00
modmuss50
aa77ad8c4c Support Mixin 0.8.5's configurable AP message levels.
Same API as MixinGradle. Closes #671
2022-07-03 21:23:36 +01:00
modmuss50
5f09152e9f Merge branch 'dev/0.12' into exp/0.13 2022-07-02 23:42:41 +01:00
modmuss50
da2992e7d9 Configurable remap configs. (#674)
* First pass at configurable remap configs.

* No benefit to making it lazy: https://github.com/gradle/gradle/blob/v7.4.2/subprojects/plugins/src/main/java/org/gradle/api/plugins/BasePlugin.java#L104 ... fixes some stuff to make it work.
2022-06-25 21:38:43 +01:00
modmuss50
9b2b857b38 Update MC manifest url. 2022-06-21 19:05:09 +01:00
Juuxel
7801be3588 Downgrade Mercury Java version
See architectury/mercury#2
2022-05-27 14:11:59 +03:00
Juuxel
f8c2feeede Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0
# Conflicts:
#	build.gradle
2022-05-27 13:38:31 +03:00
modmuss50
07ded449ee Update mercury and set source compatibility version to 17 2022-05-26 11:21:53 +01:00
Juuz
13b20feefd Update Unprotect to 1.2.0 to fix hot swap issues 2022-05-24 20:42:38 +03:00
Juuxel
70def8a31d Use MCPConfig data for processing Forge jar, support single-jar Forge (#87)
* Use MCPConfig data for merging and remapping Forge jar

* Make DependencyDownloader support multiple deps

* Support server-/client-only Minecraft with Forge

There's one slight caveat here: the server jar
contains some client-only classes that have been
patched. This also happens with the official
Forge installer in production, so it's
probably fine.

* Remove binpatcher dep

* Move McpConfigProvider to correct package

* Print tool name for functions in McpExecutor

* Fix Forge tools outputting verbose output at IDEA refresh

* Fix certain Forge deps being excluded from run configs

* Always produce the client extra jar

* Add step count to McpExecutor logging

* Allow missing args and jvmargs in MCP functions

This should fix using 1.14.4 and 1.16.5, which
don't have JVM args for everything.

* Make MCP function downloads follow redirects

* Refactor MCP step outputs, don't copy raw MC jars

* Remove MinecraftProviderBridge
2022-05-22 18:41:27 +03:00
Juuz
7f96f72502 Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0 2022-05-19 10:13:24 +03:00
modmuss50
23dfe606bb Fix mod settings for sourcesets from other projects. (#642) 2022-05-18 22:56:35 +01:00
Juuz
7fdd9950df Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0
# 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/launch/GenerateDLIConfigTask.java
2022-05-18 22:53:34 +03:00
modmuss50
b8687c87ce Support 1.19-pre1, natives are now all loaded via the classpath. 2022-05-18 18:27:11 +01:00
Juuz
c35fa7f8f3 Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0
# Conflicts:
#	.github/workflows/test.yml
#	bootstrap/test-project/build.gradle
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
#	src/main/java/net/fabricmc/loom/api/MixinExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/main/java/net/fabricmc/loom/util/ModUtils.java
#	src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataTinyRemapperExtensionImpl.kt
#	src/test/kotlin/net/fabricmc/loom/test/kotlin/KotlinClassMetadataRemappingAnnotationVisitorTest.kt
#	src/test/resources/projects/kotlin/build.gradle.kts
2022-05-08 18:36:35 +03:00
Juuxel
514ba75a1e Replace compile-time package access fixing on Forge with Unprotect (#84)
* Remove package access fixing

Requires Unprotect at runtime.

* Add Unprotect 1.0.0
2022-05-04 19:21:55 +08:00
modmuss50
f632dee2df Mod provided javadoc (#627) 2022-04-19 23:30:28 +01:00
shedaniel
d120159386 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-03-17 02:46:54 +08:00
modmuss50
fff4afe405 Initial support for split client/common sourcesets. (#606) 2022-03-04 15:01:45 +00:00
modmuss50
c406d24856 Update MCE, set the quiet Mixin AP flag. (#604) 2022-02-27 12:27:16 +00:00
Juuz
6cdf12994b Fix mixin refmaps on Forge 2022-01-26 14:36:34 +02:00
Juuz
b883c1a0cb Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
# Conflicts:
#	src/main/java/net/fabricmc/loom/util/Constants.java
2022-01-21 17:28:05 +02:00
modmuss50
2c5baf95cb Cleanup runtime only log4j, allow it on any version. 2022-01-19 22:41:12 +00:00
Juuz
db6baa837c Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11 2022-01-20 00:06:26 +02:00
modmuss50
e180e39575 Fix typo 2022-01-19 21:47:34 +00:00
Juuz
6f4cb4ae61 Merge remote-tracking branch 'upstream/dev/0.11' into merge-0.11
# Conflicts:
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2022-01-19 23:29:23 +02:00
modmuss50
b31ce4e525 Remove log4j from compile classpath starting with Minecraft 22w03a.
This is done to force modders to use SLF4J as Mojang have the ability to remove it at anytime. An option is provided to disable this.
2022-01-19 20:04:10 +00:00
shedaniel
158185d374 Merge branch '0.11.0-interf' into dev/0.11.0
# Conflicts:
#	.github/workflows/test.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/JarRemapper.java
#	src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
#	src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
#	src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java
#	src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/LoomTasks.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/Constants.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
2022-01-06 15:28:38 +08:00
shedaniel
6bca7d2b60 Merge remote-tracking branch 'architectury/dev/0.10.0' into dev/0.11.0 2022-01-06 15:12:59 +08:00
modmuss50
5a16440c1e Support ARM natives, rewrite native handling and misc cleanup. (#554)
* Rewrite natives handling, upgrade LWJGL on ARM machines.

* Remove old natives override hack, should now always be done via gradle.

* Use "idea" everywhere

* Add server specific libraries onto their own classpath. Includes misc code cleanup.

* Start on writing the excluded server libs.

* Gradle deprecation fixes, and misc cleanup

* Add support mod.

* Make native support mod none transitive.

* Update gradle.
2021-12-17 15:37:00 +00:00
Juuxel
1da4f6db84 Add forgeRuntimeLibrary configuration + some clean up (#64) 2021-12-11 19:28:06 +08:00
shedaniel
67bc46a6b3 Merge remote-tracking branch 'FabricMC/exp/0.11' into dev/0.11.0
# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test.yml
#	bootstrap/test-project/build.gradle
#	build.gradle
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2021-12-08 22:06:34 +08:00
modmuss50
6d65e120e7 Remove deprecated stuff 2021-12-04 19:00:47 +00:00