Commit Graph

1747 Commits

Author SHA1 Message Date
shedaniel
479331d9cd Merge remote-tracking branch 'FabricMC/exp/1.6' into exp/1.6
# Conflicts:
#	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/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.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/SingleJarMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomFiles.java
#	src/main/java/net/fabricmc/loom/extension/LoomFilesBaseImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/fmj/FabricModJsonFactory.java
2024-03-23 01:06:56 +09:00
modmuss50
713e1ff268 Enable decompile cache by default 2024-03-20 10:34:19 +00:00
modmuss50
c3dd16d9bf Fix idea sync task group 2024-03-20 10:26:00 +00:00
modmuss50
d0feecfbcb Don't fail setup if a project FMJ is invalid. 2024-03-19 23:03:49 +00:00
modmuss50
ae9db3fbbd Fix datagen run config having incorrect name. Closes #1000 2024-03-19 22:15:33 +00:00
modmuss50
4084fa3eb9 Add classname to stracktrace when Kotlin remapping fails. Closes #1045 2024-03-19 22:03:01 +00:00
chris
c1d51b1149 Introduce SemVer version parsing to included mods/libraries (#1075)
* Introduce SemVer version parsing & ".Final" suffix stripping to included mods/libraries

* Address review about `CONSTANT_CASE` variables, add unit test

* thanks spotless :/
2024-03-19 20:23:29 +00:00
modmuss
455b9d6aed Only set startFirstThread on versions using LWJGL 3 (#1076)
* Only set startFirstThread on versions using LWJGL 3

* Lazily evaluate RunConfig
2024-03-19 20:08:35 +00:00
Space Walker
3670ccb959 Support merging pre 1.3 Minecraft versions. (#1026)
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2024-03-19 17:25:57 +00:00
modmuss50
30ef45e878 Fix async zip processor executor.
Virtual threads are much slower, lets not worry about them for now.
2024-03-18 16:24:07 +00:00
modmuss
c2a9c2f18d Async line number remapping (#1074) 2024-03-18 15:42:57 +00:00
modmuss
7bb1224642 Experimental Decompiler cache (#1043) 2024-03-17 22:28:47 +00:00
modmuss
dbebbdb944 Add RemapJarTask.getOptimizeFabricModJson() (#1068)
* Optimise fabric.mod.json files

* Fixes

* Make opt-in

* Revert

* Fix
2024-03-12 19:11:26 +00:00
modmuss
5caac7ba8e Fix possible race condition in PrepareJarRemapTask (#1065)
* Fix possible race condition in PrepareJarRemapTask
2024-03-12 13:26:14 +00:00
modmuss
c60b456f7e Print info about locked files during configuration or genSources (#1066)
* Print info about locked files during configuration or genSources

* Use release version

* Output adjustments

* Fix build

* Add user back
2024-03-11 21:16:46 +00:00
modmuss
994a97e3de Refactor MinecraftMetadataProvider to create it earlier (#1072) 2024-03-11 12:57:52 +00:00
modmuss
f0ca06f912 Cleanup MinecraftJarConfiguration (#1070)
* Cleanup MinecraftJarConfiguration

* Fixes

* Fixes
2024-03-11 11:36:52 +00:00
Flemmli97
21b7dd9b99 Use last 16 chars for checksum (#1064)
* Fix deprecation warning in Gradle 8.7 (#1056)

* use last 16 chars for checksum

* hash the path

Co-authored-by: Flemmli97 <Flemmli97@users.noreply.github.com>
2024-03-10 13:39:22 +00:00
modmuss
2e74a84d37 Check Minecraft java version (#1059)
* Fix deprecation warning in Gradle 8.7 (#1056)

* Check Minecraft java version

* Fix

* Fix

* Fix
2024-03-10 13:38:37 +00:00
modmuss
b44e4ec3d5 Add API to get named minecraft jars. (#1063) 2024-03-10 13:37:45 +00:00
LlamaLad7
04ca22c225 Refactor/better kotlin metadata (#1061)
* Kotlin: Don't depend on metadata internals.

* Kotlin: Remap type parameter annotations.

* Kotlin: Bump metadata to 0.9.0
2024-03-04 09:40:09 +00:00
shedaniel
3347cfdd4a Merge remote-tracking branch 'FabricMC/exp/1.6' into exp/1.6
# Conflicts:
#	.github/workflows/publish.yml
#	build.gradle
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/test/resources/projects/kotlin/build.gradle.kts
2024-02-29 18:57:33 +09:00
shedaniel
5c8405f0a9 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 2024-02-29 18:40:59 +09:00
FirstMegaGame4
ae1ba0ab86 Injected Interfaces, Generics Support (#1050) 2024-02-25 15:26:00 +00:00
modmuss
3085bcfb56 Fix deprecation warning in Gradle 8.7 (#1056) 2024-02-25 13:31:58 +00:00
modmuss
0dc1ba012a Update deps (#1054) 2024-02-24 15:04:56 +00:00
modmuss50
7904141677 Prevent Gradle from running vscode task asynchronously
Closes #1048
2024-02-19 22:02:24 +00:00
Jason Penilla
1412f65e10 Print info about process lock owner (#1040)
* Print info about process lock owner

* format

* Fix extraneous space with empty args

* Avoid leaking sensitive info in program arguments by default

* fix indent

* switch var usage around
2024-02-19 18:35:58 +00:00
modmuss
9ea10ff759 Add Offline mode / locking test (#1046)
* Add Offline mode / locking test

* Fix

* Make offline tests more resilient
2024-02-19 18:35:43 +00:00
modmuss
f0df5a5a71 Add interface injection unit test (#1052)
* Add interface injection unit test

* Cleanup and fixes
2024-02-19 15:06:33 +00:00
Jason Penilla
910963a81c Download intermediary using Gradle (#1042)
* Download intermediary using Gradle

* address review

* Remove ApiWrapper

* Use detached configuration
2024-02-08 22:20:10 +00:00
Jason Penilla
2a385b3e2b Improve locking strategy for concurrent loom executions (#1031)
* Improve locking strategy for concurrent loom executions

This is especially useful for when IntelliJ decides to randomly sync the
Gradle project while I am running Gradle from the command line already.

* Fix style violations

* Adjust feedback messages and use Duration for timeout

* Fixup message
2024-02-03 23:33:28 +00:00
modmuss50
b2376a0981 Fallback to maven central for artifacts such as sources or javadocs that are not mirrored on Mojang's repo.
Fixes #1032
2024-02-03 23:30:13 +00:00
modmuss
8250b509a4 Prepare for SelfResolvingDependency's removal & Update to Gradle 8.6 (#1038)
* Prepare for SelfResolvingDependency's removal
Update to Gradle 8.6

* Update docker images

* ProjectDependency is also a SRD

* Throw if layered mappings are created too late.
2024-02-03 23:26:33 +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