Commit Graph

1715 Commits

Author SHA1 Message Date
shedaniel
5c8405f0a9 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 2024-02-29 18:40:59 +09:00
modmuss
3085bcfb56 Fix deprecation warning in Gradle 8.7 (#1056) 2024-02-25 13:31:58 +00:00
shedaniel
20b639666c Set refmap remap type for neoforge and don't hardcode the mixin ext for neoforge deps 2024-01-26 15:31:07 +09:00
shedaniel
b07102b305 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 2024-01-26 15:28:49 +09:00
modmuss50
297b7f90e9 Fix split decompile task name. Closes #1029 2024-01-25 08:49:25 +00:00
Juuz
26987212ad Merge branch 'dev/1.4' into dev/1.5 2024-01-24 20:15:42 +02:00
Juuz
483f2926e1 DependencyDownloader: Remove debug logging 2024-01-24 20:15:30 +02:00
Juuz
5135aaae38 Merge branch 'dev/1.4' into dev/1.5 2024-01-24 20:07:19 +02:00
Juuz
fcd0701a5b Upgrade Log4J version used by AT tool 2024-01-24 20:06:32 +02:00
Juuz
dfbdf26678 DependencyDownloader: Support platform dependencies 2024-01-24 20:05:25 +02:00
Juuz
f1df58a5f3 Revert "DependencyDownloader: Upgrade (transitive) Log4J if needed"
This reverts commit acd9ad739b.
2024-01-24 19:56:07 +02:00
Juuz
275cf41be5 SrgMergerTest: Adapt to MIO update 2024-01-24 16:04:03 +02:00
Juuz
db73ac982f Merge branch 'dev/1.4' into dev/1.5 2024-01-24 13:23:33 +02:00
Juuz
acd9ad739b DependencyDownloader: Upgrade (transitive) Log4J if needed 2024-01-24 13:22:35 +02:00
modmuss
5d2b75dc1d Remapper extension improvements (#1024)
* Remapper extension improvements

* Fix

* Fix generics
2024-01-16 16:27:51 +00:00
shedaniel
18945edb2e Fixes some tests 2024-01-16 17:13:01 +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
fb49f1516f Don't fail for Loom 1.5 built artifacts 2024-01-12 15:03:27 +09:00
modmuss50
615b81641c Don't apply loom-native-support when LWJGL is upgraded to support Java 19+.
Fixes a crash in 1.20.1, when using Java 21
2024-01-10 21:45:36 +00:00
shedaniel
ec73ad52ec Mark as beta 2024-01-10 22:35:32 +09:00
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