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,781 Commits 46 Branches 9 Tags
73fef942ee7b5c0d4fd42fbc68ca99cf1651e745
Commit Graph

1781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juuz
73fef942ee Merge remote-tracking branch 'upstream/dev/1.2' into dev/1.2 
# Conflicts:
#	.github/workflows/publish.yml
#	src/main/java/net/fabricmc/loom/task/DownloadAssetsTask.java
 2023-05-07 12:51:03 +03:00
modmuss50
d1f35d4221 Fix publish 2023-05-05 13:30:54 +01:00
modmuss50
35e827566e Move jar merger to loom. (#882) 
* Move jar merger to loom.

* Fix copyright years
 2023-05-05 13:26:06 +01:00
modmuss50
92eed264ab Downloader improvements (#880) 
* Fixes Integration tests locally often fail with download errors #878
* Hopefully fixes Loom is very slow to download files, often hanging for 10+ minutes #877
* "Forcing downloading" error should show much less often.
* Progress loggers get closed when download fails.
* Download assets uses a maxmium of 10 threads.
* Update tests to run against 8.3 nightlys.
* Fix windows arm tests as Mojang back-ported this change to all 1.19 versions.
 2023-05-02 09:21:51 +01:00
Juuz
6181a4fdc7 SingleJarTest: Don't test against 1.14 and 1.16 
Their server jars seem to be a bit broken with references to client-only
code, which breaks TR's assertions.
 2023-04-30 19:07:20 +03:00
Juuz
8f33803331 JarManifestService: Fix "Could not determine fabric loader version" log spam 
...by restoring this file to exactly how it is upstream.
 2023-04-30 13:58:58 +03:00
Juuz
d731734507 Add test for Crane mappings 2023-04-30 13:48:06 +03:00
Juuz
e0f241b91f Restore LayeredMappingsDependency to upstream form 2023-04-30 13:47:49 +03:00
Juuz
a83eae3a9c Make CartesianProduct parseable by Spotless 2023-04-30 13:47:29 +03:00
Juuz
614136a101 Add test for single jar Forge 2023-04-30 13:31:06 +03:00
Juuz
c847f05bee Set up dependency providers before mappings, clean up code 
This lets us use the same order as in 1.1, so I can also clean up some
changes made for the ordering. Thanks to merging MinecraftProvider's
provideFirst() and provide(), I could safely move the dependency providers
back to where they belong. (Alternatively, I could've moved the libraries
to provideFirst() but it's better to just get rid of it anyway to reduce
isForge() checks.)

Partially reverts commit 3d74e11167.
 2023-04-30 13:03:28 +03:00
Juuz
0ae0562f5f SingleJarForgeMinecraftProvider: Remove duplicate patched provider setup 2023-04-30 12:54:00 +03:00
Juuz
f96ef6fb06 MinecraftProvider: Unsplit provide and provideFirst 
Not needed anymore since the patched provider is run separately.
 2023-04-30 12:53:43 +03:00
Juuz
915521cd23 Fix code style 2023-04-30 02:46:15 +03:00
Juuz
c44640bf6e GenerateForgePatchedSourcesTask: Apply AT and SAS before decompiling 
This makes the patches not get rejected, and the output actually looks like
it should now.
 2023-04-30 02:44:08 +03:00
Juuz
560d8b94aa InjectLogic: Don't try to create null parent 2023-04-30 01:34:24 +03:00
Juuz
6736f5ce94 FunctionLogic: Set output name to output.jar 2023-04-30 01:34:06 +03:00
Juuz
7c1915db8f PatchedDecompileTest: Remove 1.14.4 and 1.16.5 from tested game versions 
They need a Java 8 toolchain for testing, but toolchains (more specifically,
the Foojay toolchain resolver plugin) cannot be used in a test kit
environment since the native services it needs are force-disabled.

The versions themselves should still work when used with the correct JDK
via toolchains.
 2023-04-30 01:02:50 +03:00
Juuz
3d74e11167 Fix Forge setup ordering, centralise Forge cache code 
The setup of dependency providers must happen after the custom repositories
added by Loom are finalised, but they're modified by the library processor
system. Therefore, we need to
1. Initialise dependency providers later.
2. Replace usages of specific dependency providers with (potentially slower)
   alternatives that don't resolve any dependencies.
 2023-04-30 01:00:58 +03:00
Juuz
9dda8bbfb8 ForgeToolExecutor: Use project Java toolchain if available 2023-04-30 00:23:00 +03:00
Juuz
ccbad51f17 Forge tests: Add multiple Gradle versions where easily possible 2023-04-29 22:57:15 +03:00
Juuz
4efac2b3b9 Forge tests: Fix convention usage 2023-04-29 22:49:35 +03:00
Juuz
53d6a8c7d3 MixinExtensionImpl: Remove convention usage 2023-04-29 22:43:06 +03:00
Juuz
bf707bd5eb Disable FabricAPITest in CI since it never completes 2023-04-29 22:38:52 +03:00
Juuz
4341297dff Merge remote-tracking branch 'upstream/dev/1.2' into dev/1.2 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java
 2023-04-24 11:25:44 +03:00
Juuz
c78607ad97 Run spotless 2023-04-24 11:24:12 +03:00
modmuss50
dcbdbf0e30 Fix @Environment(EnvType.CLIENT) not being added to the named minecraft client only jar. 2023-04-23 14:15:45 +01:00
Juuz
7b5bc30f64 Fix code format 2023-04-23 13:52:51 +03:00
Juuz
9b98c655a1 Merge remote-tracking branch 'upstream/dev/1.2' into dev/1.2 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
 2023-04-23 13:39:04 +03:00
Juuz
b1e378eb61 FmlLogConfigTest: Add 1.17+ MC versions 2023-04-23 13:36:37 +03:00
Juuz
b527ed9afe Add loom.forge.useForgeLoggerConfig 
Closes #126.
 2023-04-23 13:35:35 +03:00
Juuz
9784c5491e Add back more missing code 2023-04-23 12:32:09 +03:00
modmuss50
2e6a1a9128 Fix config roles. (#872) 2023-04-23 10:02:56 +01:00
Juuz
162b504d64 RunConfigSettings: Add support for fully custom main class (#871) 2023-04-23 09:22:41 +01:00
Juuz
200b38096a LoomConfigurations: Add forgeRuntimeLibrary to testRuntimeClasspath 2023-04-23 11:13:35 +03: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
Juuz
e162f9e56d Fix compilation errors 2023-04-23 10:54:18 +03:00
Juuz
27cfb8c033 Merge 1.2, part 2 2023-04-23 10:35:54 +03:00
Juuz
4b2090f6fe Merge 1.2, part 1 2023-04-23 10:30:30 +03:00
modmuss50
743ba4de66 Support 23w16a & Windows ARM64, and fix regression when adding ARM support on older versions. (#870) 
* Support 23w16a & Windows ARM64, and fix regression when adding ARM support on older versions.

* Fix build
 2023-04-20 22:42:44 +01:00
Juuz
8709c9f0d7 Update forge runtime to 1.1.8 to fix crash 2023-04-21 00:20:50 +03:00
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
e40c2ace57 Merge remote-tracking branch 'upstream/dev/1.1' into dev/1.1 2023-04-20 22:02:46 +03:00
modmuss50
da9f601c2f Set configuration roles + cleanup setup classes. (#868) 2023-04-20 08:45:18 +01:00
modmuss50
b35753476c Fix applying mods to server libraries. 2023-04-18 14:27:54 +01:00
modmuss50
89d09600c5 Rewrite Kotlin metadata remapping to support the latest kotlin metadata library. (#866) 2023-04-17 23:46:45 +01:00
modmuss50
0d2152444f Allow decompilers to set a smaller min heap size. 2023-04-17 15:43:07 +01:00
modmuss50
1015ef09ff Update to Gradle 8.1 (#864) 
* Update to Gradle 8.1

* Fix build, run RunConfigTest against all gradle versions.

* Fix build
 2023-04-17 13:49:49 +01:00