Commit Graph

2426 Commits

Author SHA1 Message Date
shedaniel
5089cf7ece Merge commit 'f15ff90b' into dev/1.14
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/classpathgroups/ClasspathGroup.java
#	src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
#	src/test/resources/projects/kotlin/build.gradle.kts
2026-03-21 01:44:40 +09:00
shedaniel
2d92528d0f Merge commit '91d2edef' into dev/1.14
# Conflicts:
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.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/launch/GenerateDLIConfigTask.java
2026-03-21 01:37:10 +09:00
shedaniel
167aa2de86 Merge commit '6877f704' into dev/1.14 2026-03-21 01:24:47 +09:00
shedaniel
475d70b149 Merge commit '48f7aa66' into dev/1.14
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
2026-03-21 01:23:33 +09:00
shedaniel
0ab7b1bf56 Merge remote-tracking branch 'FabricMC/dev/1.13' into dev/1.13
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
2026-03-21 01:14:58 +09:00
Juuz
85507b8de9 ArtifactMetadata: Add missing null check for MixinConfigs attribute 2025-12-07 18:23:46 +02:00
Juuz
432d05e9a6 Support refmapless mixins on older Forge releases 2025-12-07 17:52:18 +02:00
Juuz
20f2a7b154 Re-enable mixin AP in ForgeSimpleMixinApTest 2025-12-07 17:46:12 +02:00
Juuz
408b968855 Disable the mixin AP on all platforms by default
Fixes #317.
2025-12-06 13:42:19 +02:00
Juuz
26e4d2fdfd Disable workaround for Neo breakage on newer versions 2025-12-04 00:35:44 +02:00
Juuz
826297c56c Use InstallerTools to create pre-patching jar on certain versions (#315) 2025-12-03 00:30:43 +02:00
Juuz
98b14098cc Test NeoForge 1.21.10 setup 2025-12-02 12:10:26 +02:00
Juuz
a8759337e9 MPP: Don't put MC resources in the MC classes jar 2025-12-02 12:10:23 +02:00
Juuz
b99a9585a2 Fix null Forge version in PatchProvider cache dir 2025-12-02 12:10:19 +02:00
Juuz
ff4d749913 Null check Forge version when creating version cache dir 2025-12-02 12:10:14 +02:00
Naz Ikhsan
d47b37feee Fix FileAlreadyExistsException on Forge when reloading Gradle dependencies (#309)
Fixes #314.
2025-12-01 18:27:46 +02:00
Juuz
ec2faea53c PatchProvider: Extract env-specific patch files on demand (#311) 2025-11-30 21:49:10 +02:00
modmuss50
d0fc6a5f5f Fix bad cherry-pick 2025-11-22 20:22:26 +00:00
modmuss
98f4a74127 Add external classpath groups as explicit test task inputs. (#1453) 2025-11-21 20:39:47 +00:00
modmuss
f15ff90bfc Update to Gradle 9.2 (#1441)
* Update to Gradle 9

* Some test fixes

* Only test current + nightly again

* Fix unit tests

* Update Kotlin in tests

* Back to J21 for most tests for now
2025-11-09 21:04:38 +00:00
modmuss
ec236a34bd Remove -experimental from loom-no-remap (#1440) 2025-11-09 15:33:08 +00:00
Finn Rades
84d6d87650 Optimize DeobfSpecContext by scanning configurations individually (#1439)
* Optimize DeobfSpecContext by scanning configurations individually

Previously, DeobfSpecContext used getFullClasspath().getFiles() which
resolved the union of all configurations at once. This was extremely
slow (~9.8s with FAPI).

* Cleanup

* Cleanup

* Cleanup
2025-11-09 14:13:00 +00:00
modmuss50
739e124f26 CharsetEncoder is not thread safe. 2025-11-09 14:00:42 +00:00
Finn Rades
1a70c3703b Add XVFB support for headless client execution (#1432)
* Implement XVFB support

* Remove unused import

* Fix test

* Fix test v2

* Explicitly install xvfb into the test environment

* Rework xfvb execution

* Fix compile error

* Fix compile error v2

* We love testing with github ci

* Fix code-style
Build time speedup

* Build time speedup

* Fix java executable access
Fix caching

* Fix styling

* Fix xvfb again

* Fix xvfb again again

* Fix xvfb again again again

* Revert mistaken change

* Fix MC-DEV

* Update src/test/groovy/net/fabricmc/loom/test/integration/XvfbRunTest.groovy

Co-authored-by: modmuss <modmuss50@gmail.com>

* Cleanup

* Fix test

* Implement recommendations

* Implement recommendations v2

* Fix left over code

---------

Co-authored-by: modmuss <modmuss50@gmail.com>
2025-11-09 10:44:31 +00:00
modmuss
91d2edefbf NestJarsAction improvements (#1438) 2025-11-09 10:40:18 +00:00
modmuss
9ad97b74b9 Fix project deps (#1437) 2025-11-09 09:45:21 +00:00
modmuss
549edb7ad9 Remove "namedElements" when debof (#1435) 2025-11-08 23:20:06 +00:00
Finn Rades
e1cda212bd Fix failing renderDoc extract (#1434) 2025-11-08 22:39:19 +00:00
modmuss
03d4fd077b Very many debof fixes (#1430) 2025-11-08 09:04:40 +00:00
Finn Rades
f9dbaae926 Add manifest attributes and jar filtering to non-remapped jar task (#1429)
* Add manifest attributes and jar filtering to non-remapped jar task

* Fix checkstyle

* Implement feedback
2025-11-07 22:40:08 +00:00
modmuss
43e1ad7b31 Disable remap classpath system prop (#1426)
* Disable remap classpath system prop

* Fix build
2025-11-07 22:07:13 +00:00
modmuss
ec00261136 Find and apply installer data (#1428) 2025-11-07 21:54:51 +00:00
Finn Rades
eca987a2d3 Add nestJars API for nesting locally built mod jars (#1427)
* Add nestJars API for FileCollection support

* Add missin new-line

* Fix imports

* Rework constructor to avoid ugliness

* Update java docs

* Update java docs

* Implement asked improvements

* Fix checkstyle
2025-11-07 21:06:07 +00:00
modmuss50
6877f704a0 Move IncludedJarsNoRemapTest 2025-11-07 19:12:47 +00:00
Finn Rades
3a2a67bffe [Non-Obf]: Support JIJ with the regular jar task (#1425)
* Implement JIJ for jar task

* Implement JIJ for jar task, now without beeing a dumbass

* Reimplement old task, decouple

* reimplement last missing functionality

* fix checkstyle

* fix checkstyle v2

* fix checkstyle v3

* Remove dead / unneccesary check

* Cleanup / Code-Style

* Cleanup / Code-Style v2
2025-11-07 19:10:28 +00:00
modmuss
e50fce87cc Debof spec context (#1424)
* Ahhhhh

* Injected interfaces working

* Access wideners working
2025-11-07 19:04:50 +00:00
modmuss
48f7aa66fb Test compiling against the unobfuscated version. (#1423) 2025-11-05 13:49:09 +00:00
modmuss
8f40c6cb47 Create fabric-loom-no-remap plugin (#1417)
* Create fabric-loom-no-remap plugin

* Better

* Don't need the property

* Rename
2025-11-05 13:01:52 +00:00
modmuss50
5e5d9b8d0e Start on Loom 1.14 2025-11-05 13:01:25 +00:00
Juuz
fffef91cef Publish 1.13 1.13 2025-11-03 19:11:31 +02:00
Juuz
f8442e9f3f Merge remote-tracking branch 'upstream/dev/1.13' into dev/1.13 2025-11-03 17:48:06 +02:00
modmuss50
43023dc3b8 Update unpick 2025-11-03 15:10:25 +00:00
Juuz
5d59759a89 AbstractRemapJarTask: Fix manifests not being inherited (#1421)
* AbstractRemapJarTask: Fix manifests not being inherited

* Copy manifest before applying manifest service

This matches the original ordering of the manifest creation,
and fixes the override functionality in the service.

* Test merging named sections
2025-11-03 14:55:07 +00:00
Juuz
680d26fb46 AbstractRemapJarTask: Fix manifest attributes not being inherited from input 2025-11-03 15:14:12 +02:00
Juuz
c11fdb8756 Fix plugin id in RemapJarContentsTest 2025-11-03 14:33:04 +02:00
Juuz
3bb147322c Merge remote-tracking branch 'upstream/dev/1.13' into dev/1.13
# Conflicts:
#	gradle/libs.versions.toml
2025-11-03 14:06:35 +02:00
Juuz
910efd322e Update Mercury 2025-11-03 14:02:17 +02:00
Juuz
b1deb12895 Prevent disabling obfuscation on Neo and Forge for now 2025-11-03 13:54:11 +02:00
Juuz
5f6891992a Merge remote-tracking branch 'upstream/exp/1.13' into dev/1.13
# Conflicts:
#	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/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
2025-11-03 13:51:55 +02:00
modmuss50
94d4eb6e08 Update Mercury Mixin 2025-11-03 09:44:45 +00:00