imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 13:05:27 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,422 Commits 46 Branches 9 Tags
70def8a31d8a28667c490b83ba2dabc826545000
Commit Graph

161 Commits

Author SHA1 Message Date
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
modmuss50
337d17bb92 Java 17 and update libs. Closes #545 2021-12-04 19:00:47 +00:00
shedaniel
d3b041a9db Fix support for Forge 1.18 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-02 01:04:35 +08:00
shedaniel
d51b44cdaa Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingLayer.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
 2021-11-29 01:49:31 +08:00
Juuxel
9ddff5f31a Fix gradle module metadatas not including api deps in runtimeElements (#540) 2021-11-23 18:35:08 +00:00
shedaniel
a48989057d Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 2021-10-30 18:54:16 +08:00
Juuxel
587db4abae Add localRuntime and modLocalRuntime configurations (#526) 
Closes #481.

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-10-29 22:26:59 +01:00
modmuss50
e409f13b8c Add dev config with default jar task on it, to aid with depending on … (#525) 
* Add dev config with default jar task on it, to aid with depending on sub projects.

* Rename to `namedElements`

* Update src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
 2021-10-29 13:29:29 +01:00
shedaniel
6b1324fc5e Use architectury-mixin 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-20 00:57:45 +08:00
shedaniel
eff1f8ba52 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingLayer.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.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/extension/MinecraftGradleExtension.java
#	src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.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
#	src/main/java/net/fabricmc/loom/util/TinyRemapperMappingsHelper.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
 2021-09-17 02:23:45 +08:00
Juuxel
4f2ead9f16 Remove unused Constants.SOFTWARE_COMPONENT_NAME (#493) 
This was a leftover from removed code, oops
 2021-09-12 11:39:12 +01:00
shedaniel
d06081d560 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/future 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
 2021-09-11 04:24:40 +08:00
Juuxel
e1f5f3d6eb Convert AWs on Forge to ATs in RemapJarTask (#24) 
* Aw2At

* Hook Aw2At up to remapJar

* Checkstyle

* Checkstyle, part II

* Now it's Spotless' turn

* Remap the resulting AT

* you see, this is why mojmap is bad

* Inject(method = "<init>")

* Use file systems because ZipUtil is bad

* Make it false by default

* Add integ tests for aw2at

* spotless please

* fix year
 2021-09-11 02:08:41 +08:00
modmuss50
1818ff03ab Update dependencies 2021-09-07 12:31:16 +01:00
modmuss50
2bdeb869ab Update MCE and test deps 2021-09-05 16:22:51 +01:00
Juuxel
08f055489b Fix the java software component not working with Loom and fix #200 (#460) 
* Add modCompileOnlyApi, modRuntimeOnly; deprecate modRuntime

* begin

* continue

* Make RemapSourcesJarTask use properties

* finish

* Remove cursed version hack 😉

* Finish for real

* Add missing header

* Clarify a comment

* Fix tests

* Use Gradle's own *Elements and remove -dev jars

* Fix maven test

* Put mappingsFinal onto runtimeClasspath instead of implementation

* Make non-mod dependencies work with the legacy pom magic too

* Be a bit more clever when removing dev artifacts
 2021-09-05 16:08:16 +01:00
shedaniel
9366d42baa Start work on porting 0.7.4 over 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-30 14:10:32 +08:00
shedaniel
3de33252b7 Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
 2021-08-26 17:45:04 +08:00
hanbings
b320c4199a Allow developer set the site where to download game resource.(0.9 branch) (#442) 
* Add mirrors util and mirror configuration

* Fix NPE in MirrorConfiguration;
Add constants in Constants;
Rename Mirrors.java to MirrorUtil.java

* Bump gradle nightly version

* Apply mirror to download assets.
Need fix settings in LoomRepositoryPlugin.java

* Fix MojangMappingsSpec having the same hash version for each mc version.

I dont think this would be a real cause for concern as the jar would have had the mc version in it anyway.

* Revert "Fix MojangMappingsSpec having the same hash version for each mc version."

This reverts commit 61fa4d9f

* Remove MirrorConfiguration and move to MirrorUtil

* StyleCheck.

* Fix "IllegalStateException: The root project is not yet available for build."

* Remove some of the extra content.

Co-authored-by: BreakIce <suibing112233@outlook.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-08-22 15:19:58 +01:00
shedaniel
6d9065eb1e Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future 
# Conflicts:
#	bootstrap/test-project/build.gradle
#	build.gradle
#	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/task/RemapSourcesJarTask.java
 2021-08-14 14:46:18 +08:00
shedaniel
83de8bbc9a Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/JarRemapper.java
#	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/mappings/GradleMappingContext.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java
#	src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
#	src/main/java/net/fabricmc/loom/task/LoomTasks.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
#	src/test/resources/projects/kotlin/build.gradle.kts
 2021-08-14 02:31:16 +08:00
Juuxel
a0c2d877af Add modCompileOnlyApi, modRuntimeOnly; deprecate modRuntime (#458) 2021-07-31 23:46:42 +01:00
shedaniel
75234f4cbd Use Property in LoomGradleExtension & Move task groups to constants (#445) 
* Use Property in LoomGradleExtension

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Fix customMinecraftManifest

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Add deprecation messages, let's wait for the tests to run to fix the tests that are using deprecated apis

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Apply license

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Update src/main/java/net/fabricmc/loom/util/DeprecationHelper.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Fix some tests, move mixinRefmapName -> mixin.defaultRefmapName

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Move back to the api

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Fix some tests

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Apply reviews

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Update src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-07-26 20:08:03 +01:00
shedaniel
cea80b0119 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	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/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
 2021-07-20 18:03:33 +08:00
modmuss50
69caaccb07 Fallback to fabric's experimental version manifest for versions that are not in the launchermeta. 2021-07-16 23:22:03 +01:00
shedaniel
55e5b30c51 Split Minecraft and Forge jars (#34) 
* Split Forge & Minecraft jars, WIP!

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Properly remap

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Use async

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Change configurations

Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-14 16:51:14 +08:00
modmuss50
e439a1b354 Refactor LoomGradleExtension (#431) 
* First pass at refactoring the extension

* Fix inital issues.

* Combine some interfaces

* Checkstyle

* Fix years

* Add isShareCaches to api
 2021-07-14 00:03:21 +01:00