imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
982 Commits 46 Branches 9 Tags
62b9b97a52e3f65ec2cddf396c0087773cde0dac
Commit Graph

759 Commits

Author SHA1 Message Date
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
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
shedaniel
9729933433 Allow specifying multiple accesstransformers 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-30 19:26:03 +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
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
8146d775a1 net.fabricmc.loom.inject -> dev.architectury.loom.forgeruntime 2021-06-28 22:52:43 +03:00
Juuxel
ae5bc4df15 Separate Forge runtime into its own subproject 2021-06-28 22:44:02 +03:00
shedaniel
9d31be3729 Fix mergeAndSaveMappings logic 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-25 02:59: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
4dba17310d Add crane support 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 20:08:13 +08:00
shedaniel
076cda371c Make mojang mappings stable by implementing a custom license supplier 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 18:47:13 +08:00
shedaniel
10d810fad1 Readd silenceLicense 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 02:26:17 +08:00
shedaniel
4b1f5cc127 Merge remote-tracking branch 'architectury/dev/arr2' into dev/0.9 2021-06-19 22:06:52 +08:00
shedaniel
1f93aab9d8 Reapply some patches 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-18 00:04:58 +08:00
shedaniel
24a515270a Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
 2021-06-17 23:44:48 +08:00
shedaniel
ce3c96ca86 Merge branch 'dev/0.8' into dev/0.9 2021-06-17 23:42:04 +08:00
modmuss50
1f9f48052b Basic layered mappings with @ParchmentMC support (#413) 2021-06-14 18:39:03 +01:00
shedaniel
1ea5dbb1e8 Try switching to a regex and exclude in the repo that loom adds 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-14 02:16:12 +08:00
shedaniel
c80dc12dc4 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
 2021-06-14 02:02:43 +08:00
haykam821
60482833b2 Use tabs for indentation in the Fernflower decompiler (#383) 
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-06-13 14:34:46 +01:00
modmuss50
9278f6c4b9 Fix new gradle 8.0 deprecation added in 7.2 (#416) 
* Fix new gradle 8.0 deprecation added in 7.2

* Handle bootstrap tests a bit better

* Fix 0.9 wrapper tests
 2021-06-13 13:28:47 +01:00
modmuss50
0cfa88f73b Always fork the java compiler 2021-06-13 11:23:46 +01:00
KosmX
90c55b66f7 Name mappings, so I can work with multiple Minecraft versions at the same time (#26) 
* Name mappings, so I can work with multiple Minecraft versions at the same time

* Update MojangMappingsDependency.java

* Update MojangMappingsDependency.java

Co-authored-by: shedaniel <daniel@shedaniel.me>
 2021-06-13 18:13:46 +08:00
shedaniel
29822d0911 Use a better structure for the mappings folder 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-06 23:49:16 +08:00
shedaniel
1212e56d9c Detect tsrg2 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-05 01:55:26 +08:00
shedaniel
58347914b5 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 2021-06-03 23:18:37 +08:00