Commit Graph

983 Commits

Author SHA1 Message Date
shedaniel
3761a59064 Fix java.nio.file.FileAlreadyExistsException: META-INF/MANIFEST.MF
Signed-off-by: shedaniel <daniel@shedaniel.me>
(cherry picked from commit e9ccf5af91)
2021-07-18 19:45:24 +08:00
shedaniel
62b9b97a52 Add forge runtime as compileOnly
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-16 21:55:48 +08:00
shedaniel
cd0db2b562 Fix fabric remapping 2.0
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-14 17:31:35 +08:00
shedaniel
ed9b7628ac Fix fabric remapping
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-14 17:21:50 +08:00
shedaniel
55e5b30c51 Split Minecraft and Forge jars (#34)
* Split Forge & Minecraft jars, WIP!

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Properly remap

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Use async

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Change configurations

Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-14 16:51:14 +08:00
shedaniel
711212b2a9 Fix license headers
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-13 22:40:52 +08:00
shedaniel
489946a841 Run tests on actions
- Change LayeredMappingSpecBuilderTest with new hashes, we inject our custom license options, that changes the hash.

Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-13 22:32:03 +08:00
shedaniel
d0761d85cc Fix AW test
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-13 21:14:48 +08:00
shedaniel
ad3d7613b8 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-13 18:28:53 +08:00
Juuxel
f26e9e2c7b Fix AW field remapping (#434)
* Fix AW field remapping

* Fix by updating TR instead

* Fix checkstyle so that tests run
2021-07-13 08:52:42 +01:00
modmuss50
ad5ac78e06 Improve some bad stack traces.
Idk why this happens.
2021-07-13 00:05:33 +01:00
Juuxel
f13dc4eea7 Test AW field remapping (#433) 2021-07-12 23:39:32 +01:00
modmuss50
f3b336413c Fix header file from merge.
I should have really waited for the PRs to be merged first thinking about it..
2021-07-10 21:58:15 +01:00
Juuxel
e9657d63c4 Fix local file mod dependencies (#430)
* ModProcessor: Add more descriptive error TR output error message

* Fix flatDir/files/fileTree mod dependencies

* Add clarifying comment

* Use hash as a placeholder version

* ProjectTestTrait: Copy instead of reading and writing text

This allows having jars and other binary data in tests.

* Add integration test for local file dependencies

* Use File.bytes instead of Files.copy

* Use truncated SHA256 instead of murmur3
2021-07-10 21:52:38 +01:00
modmuss50
54fe0909ff Use spotless for header validation, years have been back-filled from git history 2021-07-10 21:50:53 +01:00
shedaniel
facd9d61a5 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
2021-07-11 00:23:30 +08:00
modmuss50
b24e067215 Fix yet another gradle deprecation, expand tests to cover it 2021-07-05 23:04:08 +01:00
modmuss50
8ce991dadc Fix build... 2021-07-04 01:00:18 +01:00
modmuss50
3a51777b4b Use a detached configuration to add jetbrains annotations to the source remapper classpath. 2021-07-04 00:58:09 +01:00
modmuss50
5bccf43761 Update ReproducibleBuildTest hashes, the tiny remapper update caused this. 2021-06-30 22:54:42 +01:00
modmuss50
bed2031f3b Update ASM and nightly gradle 2021-06-30 22:33:17 +01:00
shedaniel
9729933433 Allow specifying multiple accesstransformers
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-30 19:26:03 +08:00
shedaniel
f49f0201c3 Merge branch 'arch-prs/at-refactor' into dev/0.9 2021-06-30 00:52:30 +08:00
shedaniel
9c95f9a900 Allow accessTransformer to be configured
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-30 00:43:26 +08:00
shedaniel
a9c11d2fde Use configurations to resolve special source
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-30 00:43:16 +08:00
Juuxel
80a412c8c0 Silence the AT tool properly 2021-06-29 13:49:58 +03:00
Juuxel
b59a01ffa7 Simplify patch version checks 2021-06-29 13:43:14 +03:00
Juuxel
21d6aba145 Clean up manifest handling by not copying the vanilla ones 2021-06-29 13:01:25 +03:00
Juuxel
f7731572d1 Fix "merging" the jar twice 2021-06-29 12:37:24 +03:00
Juuxel
17dc301d07 Remove unused import 2021-06-29 12:12:31 +03:00
Juuxel
bfc2c06822 Merge remote-tracking branch 'upstream/dev/0.9' into arch-prs/at-refactor
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2021-06-29 12:10:42 +03:00
shedaniel
ba9e99d9f1 Implement "Loom-Patch-Version"
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-29 16:59:37 +08:00
shedaniel
f5f4ebc302 Merge remote-tracking branch 'Juuxel/arch-prs/forge-runtime' into dev/0.9 2021-06-29 16:19:54 +08:00
shedaniel
123c79e226 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 2021-06-29 16:15:58 +08:00
Juuxel
f240b0f39f Fix the previous 2021-06-29 01:12:52 +03:00
Juuxel
2a47b28fde Ignore Forge name mapping service provider 2021-06-29 00:15:16 +03:00
Juuxel
9bdd99282e Fix publishing 2021-06-28 23:58:00 +03:00
Juuxel
20f1e94601 Use typesafe constants instead of ints 2021-06-28 23:10:40 +03:00
Juuxel
8bba3fe765 Fix publication coordinates 2021-06-28 23:01:47 +03:00
Juuxel
479594deab Update TMP and fix license check 2021-06-28 22:57:19 +03:00
Juuxel
8146d775a1 net.fabricmc.loom.inject -> dev.architectury.loom.forgeruntime 2021-06-28 22:52:43 +03:00
Juuxel
31495c1ca6 Add checkstyle to forge-runtime 2021-06-28 22:50:04 +03:00
Juuxel
758333595e Use AbstractMap.SimpleImmutableEntry instead of a custom Pair class 2021-06-28 22:47:47 +03:00
Juuxel
ae5bc4df15 Separate Forge runtime into its own subproject 2021-06-28 22:44:02 +03:00
LogicFan
7fba77d43a fix broken test introduced in 54d6ef7896 (#424) 2021-06-28 16:33:18 +01:00
shedaniel
9d31be3729 Fix mergeAndSaveMappings logic
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-25 02:59:18 +08:00
shedaniel
8a8b2d88e3 Avoid double brackets
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 20:47:18 +08:00
shedaniel
f3bf0a4207 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
2021-06-20 20:24:40 +08:00
shedaniel
54d6ef7896 Fix typo "officalMojangMappings" (#420)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 13:24:10 +01:00
shedaniel
3f9dc85fba Publish Loom 0.9.0
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 20:11:18 +08:00