imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,211 Commits 46 Branches 9 Tags
8b126c23ef97aee0189d7597c40b13b1a1ffb100
Commit Graph

51 Commits

Author SHA1 Message Date
Juuz
8b126c23ef Merge 1.10 2025-03-04 18:37:30 +02:00
modmuss
fc26023047 Configure compile task mixin options lazily (#1256) 
* Try to configure compile task mixin options lazily

* Fix CompileJava being realised too soon, and other misc lazy task fixes.
 2025-01-26 21:06:30 +00:00
Juuz
09174f0ad3 Merge 1.9 2024-12-06 19:35:18 +02:00
modmuss
1f28935221 Initial project isolation support (#1215) 
* Enable project isolation

* Add test for COD

* Make spotless happy
 2024-11-14 21:56:20 +00:00
Juuz
a0d33732a3 Merge 1.7, part 3 2024-07-01 19:55:25 +03:00
Juuz
4ae4134b70 Merge 1.7, part 2 2024-07-01 19:28:43 +03:00
modmuss50
63214b491f Don't print warning about incorrect sources jar when there is no sources jar. 2024-05-16 21:17:14 +01:00
Luke Bemish
63ebc35e1d Improve how include configuration works (#1080) 
* Initial work on better include configuration

* Remove unused members

* Substantially simplify

* Only process configuration once

* Hopefully fix tests

* Make platform dependencies work again

* Fix edge case where include or super configuration has withDependencies action

* Fix including subproject/composite jars and add test

* Remove needless following of external result

* Change priority for module location discovery

* Fix failing test

* Apply suggestions from code review

Co-authored-by: modmuss <modmuss50@gmail.com>

---------

Co-authored-by: modmuss <modmuss50@gmail.com>
 2024-05-04 18:16:32 +01:00
shedaniel
ff3546e108 Merge remote-tracking branch 'FabricMC/dev/1.6' into dev/1.6 2024-04-28 20:22:49 +09:00
modmuss
7010ad633b Fix sources publishing (#1098) 
* Fix sources publishing

* Revert "Fix sources publishing"

This reverts commit a3fec653dc5255b9bc939dd3305e5df8529da729.

* A better fix
 2024-04-15 15:12:10 +01:00
shedaniel
46d4b56fa1 Merge remote-tracking branch 'FabricMC/dev/1.6' into dev/1.6 2024-04-04 22:15:32 +09:00
modmuss
e96c0e2fbd Fix remapped sources publishing (#1084) 2024-04-01 21:13:50 +01:00
shedaniel
b07102b305 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 2024-01-26 15:28:49 +09:00
modmuss50
255b3b2b88 Fix #1023 
Just a quick fix for now, might look into why its broken in 1.6
 2024-01-13 10:58:08 +00:00
shedaniel
a85428d43b Fix compile errors 2024-01-10 22:35:12 +09:00
shedaniel
c5a1a2d6b2 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
 2024-01-10 22:27:36 +09:00
modmuss
872d12ace0 Update tiny-remapper, misc perf improvements, test fixes. (#1009) 
* Only mixin remap/analyse classpath jars that use static mixin remappings.

* More of a mess

* Less of a mess?

* Nope?

* Exclude the none root MC jars from the remap classpath when using MPO

* Improve test a little

* Update TR

* Checkstyle

* Fix DLN test

* Fix possible crash when closing build services
 2024-01-04 00:39:36 +00:00
shedaniel
beb04d30f2 Merge remote-tracking branch 'FabricMC/exp/1.5' into exp/1.5 
# Conflicts:
#	.github/workflows/publish.yml
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
#	src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/ProcessedNamedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
#	src/test/groovy/net/fabricmc/loom/test/unit/kotlin/KotlinRemapperClassloaderTest.groovy
 2023-12-26 18:39:12 +08:00
J.T. McQuigg
53112fb0b5 Replace Deprecated .getBuildDir with .getLayout().getBuildDirectory() and make Lazy (#978) 
* replace Deprecated .getBuildDir with .getLayout().getBuildDirectory().getAsFile().get()

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>

* Make lazy

Co-authored-by: modmuss <modmuss50@gmail.com>

* MORE

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>

* remove file import

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>

---------

Signed-off-by: Joseph T. McQuigg <J.T.McQuigg12@gmail.com>
Co-authored-by: modmuss <modmuss50@gmail.com>
 2023-12-08 09:00:34 +00:00
Juuz
13cfbb9da5 Merge remote-tracking branch 'upstream/exp/1.3' into exp/1.3 
# 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/decompile/SingleJarDecompileConfiguration.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/mapped/IntermediaryMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
 2023-06-21 21:40:25 +03:00
modmuss
6e72125c0f Dont allow gradle to run game/genSources tasks in parallel (#901) 
* Dont allow gradle to run game/genSources tasks in parallel

* Fix build
 2023-06-13 11:16:56 +01:00
Juuz
9031476066 Fix compilation errors and add back missing code 2023-04-23 11:10:49 +03:00
Juuz
89fd6ff6c9 Merge 1.2, part 3 2023-04-23 10:58:33 +03:00
modmuss50
da9f601c2f Set configuration roles + cleanup setup classes. (#868) 2023-04-20 08:45:18 +01:00
Juuz
0314829e26 Merge with Fabric 1.1, stage 3 2023-02-16 01:02:58 +02: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
shedaniel
216b4ce785 Merge remote-tracking branch 'FabricMC/dev/0.13' into dev/0.13.0 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
 2022-08-11 00:59:05 +08:00
Juuz
cf28130f2e Merge with Fabric 0.13, stage 6 2022-08-09 17:41:57 +03:00
Juuz
56995fd210 Merge with Fabric 0.13, stage 2 2022-08-09 17:25:34 +03:00
Juuz
48126bd5d6 Merge with Fabric 0.13, stage 1 2022-08-09 17:18:43 +03:00
modmuss50
d0f63cf652 Don't hardcode "dev" classifier for publishing, fixes #662 2022-08-04 13:22:02 +01:00
modmuss50
e561cca19a Split mod dependencies into client/common as required. 2022-08-04 08:56:37 +01: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
5f09152e9f Merge branch 'dev/0.12' into exp/0.13 2022-07-02 23:42:41 +01:00
modmuss50
b25e5cd5a6 Only realise the gradle property being queried. 
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 2022-07-02 23:38:49 +01:00
modmuss50
97927f913a Replace getRemapArchives & getSetupRemappedVariants with a gradle property. (#678) 
* Replace getRemapArchives & getSetupRemappedVariants with a gradle property as they are evaluated too early to be set.

* Use true for all projects.

* Cleanup, you can set properties for each subproject.

* Fix docs.
 2022-07-01 18:13:56 +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
317c6daedd Apply the same manifest attributes to the sources jar. Including a list of client only entries. 
Will be used to split the sources into client/common jars in a later change.
 2022-06-20 21:11:11 +01: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
40b3ebc80e Add property to control if a remap jar includes client only entries. 2022-05-20 11:22:05 +01:00
Juuz
0f73e65a59 Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
 2022-01-27 19:56:59 +02:00
modmuss50
03089cf6d7 Setup remapped variants in afterEvaluate to work around issues caused by creating the lazy remap tasks too early. (#586) 2022-01-27 16:01:46 +00:00
shedaniel
bd3d9794b6 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-01-27 20:41:37 +08:00
modmuss50
f1bc512eca Handle no sourcesElements configuration. 2022-01-26 14:15:44 +00:00
Juuz
849961adf4 Actually fix mixin configs by configuring them in afterEvaluate 2022-01-26 14:49:01 +02:00
Juuz
6cdf12994b Fix mixin refmaps on Forge 2022-01-26 14:36:34 +02:00
Juuz
5c0bceff27 Fix missing mixin configs in mod jars 2022-01-26 14:27:32 +02:00
Juuz
a7c3a9f740 Fix Aw2At not being applied 2022-01-21 01:21:54 +02:00
modmuss50
d40241d75a Fix performance regressions in large multi-project builds. (#571) 
* Perf improvements to multi-project builds.

* Fixes.

* More fixes.

* Layered mappings fixes

* Perf improvements. Undo broken fix.

* Fix remap classpath being empty.

* Another gradle bug? Either way this is fine and works.

* Fix broken test

* Final fixes?

* Fix and cleanup mixin ap mappings.
 2022-01-14 19:50:45 +00:00
modmuss50
4158062ce5 Experimental support for split common and clientonly minecraft jars. (#561) 
This lays the ground work for split client and server mod code. With this first phase when enabled loom will generate a clientonly and common minecraft jar. Fabric loader and API will both need changes to support this before it can be used to develop mods.

Phase two of this project will handle splitting mod code into a client and common source set along with spliting any dependencies. 

Mostly fixes #539 by sepreating decompile tasks
 2022-01-04 21:19:03 +00:00