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
1,801 Commits 46 Branches 9 Tags
e0efe9ce6048d915568a805a716d28977e451010
Commit Graph

1801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juuz
e0efe9ce60 Remove beta warning 1.2 2023-06-21 21:30:29 +03:00
Juuz
cce1fa3fff Merge branch 'dev/1.1' into dev/1.2 2023-06-12 20:48:09 +03:00
Juuz
b7f3c674f9 ModMetadataFiles: Prefer quilt.mod.json over architectury.common.json 2023-06-12 20:45:55 +03:00
Juuz
479bb0ba17 Fix architectury.common.json etc being used over fabric.mod.json (#140) 
Fixes #136.
 2023-06-12 20:45:12 +03:00
Juuz
6d5e57c292 Remove unused forgeNamed configuration 
It's been unused for multiple versions, and it's not a
supported public API - it can be removed safely.
 2023-06-12 20:08:25 +03:00
Juuz
4390d16183 Fix #132 2023-06-12 20:08:25 +03:00
Juuz
e485c5e68c Add test for #132 2023-06-12 20:08:25 +03:00
shedaniel
4ce760a062 Change broken mods.toml warning to info 2023-06-12 17:34:53 +08:00
Juuz
292bea7d33 Fix unescaped string in ForgeRunConfigTest 2023-06-04 20:33:09 +03:00
Juuz
59f2936e57 Fix code style 2023-05-30 20:05:52 +03:00
Juuz
4eadfb2d19 Add basic test for Forge run config validation 2023-05-30 19:32:38 +03:00
Juuz
da08cf9330 AtRemapper: Work around Gradle 8.1 bug causing Files.readString(path) to call Path.toFile() 
Same issue and fix as in 4ff9f726e1,
just a different class.

Fixes #129.
 2023-05-11 23:51:37 +03:00
Juuz
fd46c13778 AtRemapper: Work around Gradle 8.1 bug causing Files.readString(path) to call Path.toFile() 
Same issue and fix as in 4ff9f726e1,
just a different class.

Fixes #129.
 2023-05-10 18:36:16 +03:00
Juuz
b2988d2263 Publish 1.2 2023-05-07 17:19:13 +03:00
Juuz
5ddbd495e4 Add beta log notice 2023-05-07 12:52:13 +03:00
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
4337986982 ForgeToolExecutor: Use project Java toolchain if available 2023-04-30 19:22:56 +03:00
Juuz
e35789b392 JarManifestService: Fix "Could not determine fabric loader version" log spam 
...by restoring this file to exactly how it is upstream.
 2023-04-30 19:22:37 +03:00
Juuz
5fb322a83d 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 19:22:33 +03:00
Juuz
2d6218686e InjectLogic: Don't try to create null parent 2023-04-30 19:22:27 +03:00
Juuz
827698d5d1 FunctionLogic: Set output name to output.jar 2023-04-30 19:22:22 +03: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