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

1125 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
8ba98091a0 Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0 2022-05-21 11:49:29 +03:00
modmuss50
1956c03df2 Handle missing classpath entries when source remapping. 2022-05-21 01:05:10 +01:00
modmuss50
86d74b789a Fix client remap classpath. 2022-05-21 00:53:14 +01:00
Juuz
bf7880bfed Fix certain Forge deps being excluded from run configs 2022-05-20 16:46:13 +03:00
Juuz
69c6afbf8d Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/LoomTasks.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
 2022-05-20 15:54:29 +03:00
modmuss50
79668102c0 Fix crash when syncing idea when server only is enabled. Closes #652 2022-05-20 13:46:43 +01:00
modmuss50
40b3ebc80e Add property to control if a remap jar includes client only entries. 2022-05-20 11:22:05 +01:00
modmuss50
743e009068 Fix default client run config name when using split sourcesets. 2022-05-20 01:01:01 +01: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
c46100c76e Fix split env overriding custom run config sourcesets. 2022-05-19 01:24:58 +01:00
modmuss50
997f9a8acd Fix generation of invalid classpath groups when idea compiler output dir is not set. 2022-05-18 23:47:17 +01:00
modmuss50
5a8e048950 Delay removal of legacy publication data changes. 2022-05-18 23:00:12 +01: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
Juuxel
bab1aa8216 Expose underlying messages in RemapJarTask and Minecraft setup (#650) 
Closes #649. Closes #638.
 2022-05-17 21:35:38 +01:00
Juuz
4d042cd4a5 Fix mixin refmap generation on Forge 2022-05-17 21:46:36 +03:00
Juuz
668c9dbeba Isolate mappings provider and TR service on Forge 2022-05-17 21:07:17 +03:00
Juuz
4369492b55 Make missing TR mapping namespace throw an exception instead of printing to stderr 2022-05-17 20:44:05 +03:00
Juuz
9c0b95860a Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0 2022-05-11 19:18:28 +03:00
modmuss50
9f341a9b47 Dont depend on other prepare tasks, only run after. (#637) 2022-05-10 23:22:01 +01:00
modmuss50
138685d141 Reduce log level when transitive access widener fails to find target method in mappings. 
See: https://github.com/FabricMC/fabric-loom/issues/644
 2022-05-10 19:37:00 +01:00
modmuss50
8c227a2d8c Fix/cleanup AP configuration name. (#643) 2022-05-10 19:31:21 +01:00
Juuz
b97def4e56 Remove workaround for #42 
This is not relevant anymore as it has been
fixed in Forge. The code is reverted to how
it's in upstream Loom.

See MinecraftForge/MinecraftForge#8063.
 2022-05-09 14:28:48 +03:00
Juuz
a9ece4ac48 Fix Kotlin remapper classloader 2022-05-08 19:38:16 +03:00
Juuz
b57f7dcc68 Fix Forge crashing because configurations haven't been set up 
afterEvaluate is my passion
 2022-05-08 19:12:46 +03:00
Juuz
45b69df11a Fix compilation and code style 2022-05-08 18:59:06 +03: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
Emma C. Pointer-Null
5770b9a12d Improvements to Quilt JiJ (#83) 2022-05-08 16:57:17 +08: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
Juuz
84a9b23df5 Aw2At: Fix incorrect AT for mutable fields 
Fixes #76. Also introduces better tests
that cover this issue and the raw modifier
changes.
 2022-05-03 13:56:31 +03:00
modmuss50
8b3bfde825 Add LibraryLocationLogger to help debug loom library version issues. 2022-05-01 13:26:03 +01:00
modmuss50
752c829eb0 Fix ModSettings not using a ConfigurableFileCollection :) 
Need to add some tests for this ;)
 2022-04-30 21:35:17 +01:00
Juuz
99235bcba9 Fix code style 2022-04-24 19:37:06 +03:00
NinjaPhenix
2df553a4cb Some minor bug fixes for iface injection & refmaps in mixins for quilt. (#81) 2022-04-24 20:41:45 +08:00
shedaniel
06b75b3439 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
 2022-04-22 14:05:07 +08:00
KosmX
6ecaa609e8 Create MixinMappingsService for every target MC version. (#631) 
* Create MixinMappingsService for every target MC version.

* Use mappings identifier to identify MixinMappingsService.
 2022-04-21 20:55:37 +01:00
KosmX
9e57a4fc54 Create MixinMappingsService for every target MC version. (#631) 
* Create MixinMappingsService for every target MC version.

* Use mappings identifier to identify MixinMappingsService.
 2022-04-21 20:54:29 +01:00
modmuss50
1dfea9ef7e Add a FileCollection to ModSettings 2022-04-21 20:52:11 +01:00
shedaniel
7211c839fe Remap fabric mods on quilt as well 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2022-04-21 14:14:14 +08:00
shedaniel
73a09f5802 Make quilt mode suffix with _arch_quilt to not interfere with each other 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2022-04-21 14:14:07 +08:00
modmuss50
b7cdb718d7 Update to support 22w16a's arm64 macos natives, and tiny remapper. 2022-04-20 18:37:11 +01:00
shedaniel
47c44245be Add quilt mode 
Squashed commit of the following:

commit 2f5cd64dd232996e92e8d1f71e6ce5deb747d247
Author: shedaniel <daniel@shedaniel.me>
Date:   Wed Apr 20 16:23:18 2022 +0800

    Make installer json ignore fabric's on quilt mode

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

commit 381b346c88f22f30acd9620f57f6ef03e6c50102
Merge: f272145a 1c48b6cb
Author: shedaniel <daniel@shedaniel.me>
Date:   Wed Apr 20 15:43:46 2022 +0800

    Merge remote-tracking branch 'architectury/dev/0.11.0' into feature/0.11.0-quilt

commit f272145a19949c72bf1ebdcec3f7c13ed498eb5a
Author: shedaniel <daniel@shedaniel.me>
Date:   Sat Apr 16 14:22:07 2022 +0800

    Match quilt-loom up to 44030f5d4659c425cb6f1450f46be5a0546964f2

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

commit 0e084be5e391e79a75467d1c9a56efd02821247a
Merge: 471d6a06 4a7a2660
Author: shedaniel <daniel@shedaniel.me>
Date:   Sat Apr 16 14:13:40 2022 +0800

    Merge remote-tracking branch 'architectury/dev/0.11.0' into feature/0.11.0-quilt

commit 471d6a065a18839bbd4d724d8f4383de53752e8b
Author: shedaniel <daniel@shedaniel.me>
Date:   Mon Mar 28 18:47:20 2022 +0800

    Add QMJ support

    Signed-off-by: shedaniel <daniel@shedaniel.me>
 2022-04-20 16:27:43 +08:00
modmuss50
f632dee2df Mod provided javadoc (#627) 2022-04-19 23:30:28 +01:00
modmuss50
29499fd0bd Workaround: https://github.com/gradle/gradle/issues/14727 2022-04-19 18:14:50 +01:00
modmuss50
5f5dfcb3a7 Add refmap target namespace property. (#628) 
* Add refmap target namespace Property.

* Fix build.
 2022-04-17 21:15:58 +01:00
modmuss50
0fda2a07bd Improve kotlin plugin version retrieval. 
Update FLK in test.
 2022-04-17 20:20:50 +01:00
modmuss50
ba2c98f7fd Run the kotlin metadata remapper in its own classloader with the compiler kotlin version. (#626) 2022-04-16 18:39:11 +01:00
shedaniel
1c48b6cbd9 Fix #79 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2022-04-16 15:19:23 +08:00