imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,947 Commits 46 Branches 9 Tags
70e9b8c56339e314b60e4d3c79a445273d4b0420
Commit Graph

1695 Commits

Author SHA1 Message Date
shedaniel
70e9b8c563 Merge remote-tracking branch 'origin/dev/1.4' into dev/1.5 2024-01-10 22:35:20 +09:00
shedaniel
a85428d43b Fix compile errors 2024-01-10 22:35:12 +09:00
shedaniel
b3d2e349f5 Fix checkstyle 2024-01-10 22:33:19 +09:00
shedaniel
39e23837e5 Merge remote-tracking branch 'origin/dev/1.4' into dev/1.5 
# Conflicts:
#	gradle/libs.versions.toml
 2024-01-10 22:28:25 +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
shedaniel
36ec0dc99d Remove beta warning 2024-01-10 22:22:46 +09:00
shedaniel
0446bbfef2 Merge remote-tracking branch 'FabricMC/dev/1.4' into dev/1.4 2024-01-10 22:21:27 +09:00
modmuss
480dd5e393 Some minor peformance improvements (#1019) 2024-01-06 17:17:26 +00:00
Jason Penilla
8df229313e Cache FMJs and ArtifactMetadata when reading during configuration time (#1018) 
We have to read every jar on remapped configs to see if they are a mod or should otherwise be remapped. By caching we can avoid re-reading jars that are java-runtime & java-api or are on multiple remapped configs. The cache scope could probably be widened to help more with multi-project builds, but I am leaving that for future work as I think it would also require some sort of invalidation.
 2024-01-05 18:35:39 +00:00
modmuss
a0aa6eafb2 Validate jar and fail if it was built with Loom 1.5 or later. (#988) 2024-01-04 14:15:15 +00: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
modmuss
c5d73548e7 Remove jackson (#1014) 
* Remove jackson

* Fix unit tests
 2024-01-02 22:35:37 +00:00
modmuss
20ea426a7a Ensure that modImplementation is processed first, so any installer.json on that configuration takes priority. (#1015) 2024-01-02 22:35:22 +00:00
shedaniel
119898df76 Migrate to Fabric TR 2023-12-26 18:57:21 +08:00
shedaniel
cea4b39f22 Fix merge conflicts 2023-12-26 18:45:04 +08: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
modmuss50
6452509ec5 Optimise IncludedJarFactory & ZipReprocessorUtil 
No longer processes the jar multiple times, caches the jar in place.

ZipReprocessorUtil now directly writes the file to disk, instead of first copying it to memory.
 2023-12-20 16:58:51 +00:00
modmuss
85101bca01 Fix Intelij download sources hook. (#1006) 
* Fix Intelij download sources hook.

* Cleanup and performance improvements
 2023-12-20 16:49:42 +00:00
modmuss
ecc7e730e9 Read data generation modid from FMJ by default. And code cleanup. (#1008) 
* Read data generation modid from FMJ by default. And code cleanup.

Closes #999

* Fix #1000
 2023-12-20 15:52:13 +00:00
modmuss
51e1da7330 Update deps (#1007) 
* Update deps

* Fix KotlinRemapperClassloaderTest
 2023-12-20 10:14:26 +00:00
modmuss50
e980ee60ad Use a Property for appendProjectPathToConfigName 2023-12-19 16:49:27 +00:00
modmuss50
a6547244e9 Add loom.getMinecraftVersion() 
Closes #982
 2023-12-19 16:31:35 +00:00
Matt Sturgeon
bbf7f96b41 Allow disabling RunConfig appending project path (#1005) 
* Fix data gen folder not being added to resources.

Closes https://github.com/FabricMC/fabricmc.net/issues/69

* Allow disabling RunConfig appending project path

Add a `appendConfigNameWithPath` property to `RunConfigSettings` controlling whether to append the path for non-root projects.

Default behaviour is unchanged.

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2023-12-19 16:25:19 +00:00
Jason Penilla
6f38d5f2e8 Change how include disables transitive dependencies to allow platform dependencies to work (#838) 
* Change how `include` disables transitive dependencies to allow platform dependencies to work

* style fix

* Cleanup and add test

* spotlessApply

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2023-12-19 13:46:35 +00:00
Juuz
1ea6b89130 Check expected Minecraft version before running MCPConfig (#183) 2023-12-16 21:07:15 +02:00
Juuz
45bb6841d8 Fix NeoForge ATs not being fully remapped (#185) 
Fixes #184. Also rewrites all code using the CadixDev AT library to use our fork.
 2023-12-16 20:18:18 +02:00
Jamalam
f2e8ff2cef Check refmaps exist before adding them to mixin configs (#971) 2023-12-15 09:50:25 +00:00
modmuss
014a6fce2b Remapper extensions (#984) 
* Remapper extension API

* Fix build

* More work

* Fixes, thanks Gradle.

* Build fix

* Cleanup
 2023-12-15 09:47:26 +00:00
Juuz
0e9663b7a4 Add missing Minecraft version check for mappings, fix typos (#1002) 
* Fix data gen folder not being added to resources.

Closes https://github.com/FabricMC/fabricmc.net/issues/69

* Add missing Minecraft version check for mappings, fix typos

Fixes #1001.

* Add test for TinyJarInfo

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2023-12-15 09:46:53 +00:00
Juuz
5b3e7c72b6 Merge remote-tracking branch 'upstream/dev/1.4' into dev/1.4 2023-12-14 20:06:38 +02:00
Juuz
94eac81d45 Revive unified mods for the development environment (#182) 
* Add Union Relauncher for Forge 49+

* Don't apply this on Neo
 2023-12-13 14:14:27 +08:00
modmuss50
cf8cbb245b Fix data gen folder not being added to resources. 
Closes https://github.com/FabricMC/fabricmc.net/issues/69
 2023-12-09 22:28:50 +00:00
modmuss50
d9a436c684 Fix data gen folder not being added to resources. 
Closes https://github.com/FabricMC/fabricmc.net/issues/69
 2023-12-09 22:27:06 +00:00
dicedpixels
7dfe800768 Filter out realms connection error message from debug log (#991) 
* feat: filter out realms connection error message from debug log

* fix: multiple regex filters
 2023-12-09 14:03:02 +00:00
Juuz
9f070d270f AccessWidenerUtils: Ignore fabric.mod.json on (Neo)Forge 
Fixes #165. Closes #180.
 2023-12-09 14:14:34 +02: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
Jason Penilla
229b3b3800 Don't resolve source artifacts in CI (#994) 2023-12-04 11:52:11 +00:00
modmuss
b987b4e711 Always use unix line endings on windows (#986) 
* Always use unix line endings on windows

* Also run checks on windows.

* Fix binary files :)
 2023-11-23 22:36:57 +00:00
shedaniel
de3c2056da Fix merge conflicts 2023-11-22 15:08:15 +08:00
shedaniel
00254ea567 Don't remap Forge with classpath (?) 2023-11-22 15:02:33 +08:00
shedaniel
e3c5226da7 Merge remote-tracking branch 'FabricMC/exp/1.5' into exp/1.5 
# Conflicts:
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java
#	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/util/Constants.java
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
 2023-11-22 14:56:39 +08:00
modmuss
92da5adb48 Remove Minecraft libraries from the remap classpath. (#987) 2023-11-20 19:15:30 +00:00
modmuss
99380d98e5 Add Fabric-Loom-Mixin-Remap-Type manifest entry (#980) 2023-11-20 15:19:48 +00:00
Jason Penilla
f63a4f4d25 Skip remapping in AbstractRemapJarTasks when source and target namespaces match (#985) 
* Skip remapping in `AbstractRemapJarTask`s when source and target namespaces match

The "remap jar" tasks have much more functionality than simply remapping jars at this point, such as adding namespace metadata, nesting jars, ensuring reproducible builds, etc. Some custom build logic may want to take advantage of these features without the full overhead of no-op remapping with TinyRemapper/Mercury.

* Add test
 2023-11-20 10:35:46 +00:00
modmuss
846d16ce2d Update deps (#983) 2023-11-19 16:59:35 +00:00
shedaniel
4e805d2b9b Fix compile errors 2023-11-18 00:38:54 +08:00
shedaniel
ea1d58e106 Merge remote-tracking branch 'FabricMC/exp/1.5' into exp/1.5 
# Conflicts:
#	build.gradle
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
 2023-11-18 00:33:59 +08:00
Juuz
229f073492 Improve log message for experimental platforms 2023-11-17 16:24:29 +02:00
Juuz
7c08c02796 ModPlatform: Introduce display name 2023-11-17 16:24:16 +02:00
Juuz
ad7eee6fa5 ModProcessor: Clean up with MappingOption.forNamespaces 2023-11-17 16:19:52 +02:00