imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 05:27:43 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,125 Commits 46 Branches 9 Tags
4e510be1def7b5cdbe53f3bf1969f35a44693692
Commit Graph

1125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shedaniel
4e510be1de Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java
 2021-09-29 01:29:17 +08:00
shedaniel
b4fd2e10f5 Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-29 01:28:29 +08:00
modmuss50
f33637aa3c Improve error handling around dep remapping. 2021-09-28 17:22:13 +01:00
modmuss50
80ad300b97 Fix failure when running dependencies task when using layered mappings. 
A SelfResolvingDependency has to be a FileCollectionDependency or a ModuleDependency by the looks of it.
 2021-09-28 16:34:43 +01:00
shedaniel
c6f51f1dd2 Add -Dloom.refresh=true option (#508) 
* Add -Dloom.refresh=true option

* Use Boolean.getBoolean
 2021-09-28 12:18:08 +01:00
shedaniel
357656ca3e Fix #54 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-28 19:17:47 +08:00
modmuss50
676a498e0c Fix record signatures based on data provided by mappings. (#507) 
Reads "extras/record_signatures.json" from mappings jar, just works with yarn.

Mojmap:

```
mappings loom.layered {
   officialMojangMappings()
   signatureFix("net.fabricmc:yarn:21w38a+build.9:v2")
}
```
 2021-09-28 10:38:11 +01:00
shedaniel
9464b5ab07 Fix #49 
We are checking if there are methods with the same srg name that are already added, if it is, then we would not fill in these names
This is especially troublesome with methods annotated with @DontObfuscate (e.g. m_129629_), with environments like yarn where methods with the same srg name may not inherit the same names due to parameter mappings and inheritance

This requires further testing!

Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-27 21:47:52 +08:00
shedaniel
fd9694da37 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
 2021-09-25 20:49:45 +08:00
shedaniel
474232e4bd Fix version being 0.0.0 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-25 20:48:49 +08:00
shedaniel
bfa8bc71c0 Merge remote-tracking branch 'Juuxel/fix/param-names-tiny-srg' into dev/0.10.0 2021-09-25 20:41:44 +08:00
Juuz
d1b1f8a27f Remove manual version 2021-09-25 15:18:07 +03:00
Juuz
4133850e85 Fix another little oopsie 2021-09-25 15:17:51 +03:00
Juuz
b31dbc5eea More work on srg merger 2021-09-25 15:00:39 +03:00
Juuz
9f2cae12d4 Fix an oopsie 2021-09-25 14:35:10 +03:00
Juuz
8c5b4f8db5 Fix comments, locals and arguments missing from SRG merged mappings 2021-09-25 14:34:51 +03:00
Juuz
a9bc224ca4 Remove forge runtime from .gitignore 2021-09-25 14:03:27 +03:00
shedaniel
c0224d4aa5 Fix checkstyle 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-24 02:29:42 +08:00
shedaniel
9033d1e781 Fix #47, Fix #48 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-24 02:23:42 +08:00
Juuxel
7d2dad6e46 Support a wider range of parameters in FileSpec (#502) 
* Support a wider range of parameters in FileSpec

Now supports
- all Providers (incl. Property)
- groovy template string literal (GString)
- Path and gradle FileSystemLocation

* Use the createFromFile overloads directly

* Use charsequence instead of (g)string

* Update src/main/java/net/fabricmc/loom/api/mappings/layered/spec/FileSpec.java
 2021-09-22 22:00:41 +01:00
shedaniel
be17a02e90 Use better gradle conventions, and fix #311 (#503) 
* Use better gradle conventions, and fix #311

* Fix checkstyle

* Revert some changes

* Use convention

* Remove set classpath
 2021-09-22 21:59:51 +01:00
shedaniel
5bf22dd50d Fix debugger spam 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-22 22:52:13 +08:00
shedaniel
a203dab75d Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java
 2021-09-22 22:39:28 +08:00
shedaniel
621c0e1bc9 Fix srg not merging correctly and fix #42 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-22 22:38:12 +08:00
shedaniel
a50c361223 Make MixinRefmapHelper properly get the mixin configs 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-21 02:29:24 +08:00
modmuss50
06e60e5c29 Enable legacy mixin ap by default (#501) 2021-09-20 17:44:08 +01:00
shedaniel
a0c5f27523 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 2021-09-21 00:39:11 +08:00
shedaniel
48387a9909 Merge remote-tracking branch 'architectury/dev/0.10.0' into dev/0.10.0 2021-09-21 00:39:05 +08:00
shedaniel
bb8707822a Fix generateSrgTiny with 1.17 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-21 00:38:16 +08:00
Juuxel
979a9d4882 Move all Forge-only properties to Forge extension (#46) 2021-09-21 00:10:50 +08:00
modmuss50
1752659291 Dont add loom to compileOnly config. 
I dont think this has been required since MCE is a thing.
 2021-09-20 13:05:45 +01:00
shedaniel
6522a826e1 Fix forge with AT 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-20 01:59:54 +08:00
shedaniel
fa105469f4 Only setup local mods on forge 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-20 01:00:38 +08:00
shedaniel
6b1324fc5e Use architectury-mixin 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-20 00:57:45 +08:00
shedaniel
1c8554a947 Close #12 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-19 21:04:49 +08:00
shedaniel
770597a588 Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-19 20:36:22 +08:00
shedaniel
4b698d54bb Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
 2021-09-19 20:20:37 +08:00
modmuss50
256e61ce3c Rebuild record components from field names, improves decompile (#497) 2021-09-19 08:53:13 +01:00
shartte
98d8f37672 Fixes merging of mappings for cases like: class_1234 is mapped, but class_1234$1 is not. (#498) 2021-09-18 21:15:32 +01:00
shedaniel
8216479edf Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
 2021-09-19 02:53:31 +08:00
shedaniel
c40d33b996 Publish to maven for testing purposes 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-19 02:48:06 +08:00
shedaniel
b8b5cde1cd Add workaround with yarn inner classes 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-19 02:47:43 +08:00
shedaniel
c17274a880 Fix transitive AW test 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-18 19:11:05 +08:00
shedaniel
6f9fb64e34 Fix tests crash with fabric mode 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-18 17:25:13 +08:00
shedaniel
145ee69018 Fix spotless license 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-18 16:25:52 +08:00
shedaniel
dfba3a1dc3 Fix codestyle, add forge tests 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-18 15:28:28 +08:00
shedaniel
7f54808315 Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-18 14:00:14 +08:00
shedaniel
3aa0e5f731 Merge remote-tracking branch 'architectury/dev/0.10.0' into dev/0.10.0 2021-09-18 13:59:34 +08:00
modmuss50
ae9a9e120d Update lorenz-tiny 2021-09-17 15:44:41 +01:00
modmuss50
2ec1dd032f Update tiny remapper, register the new LV pattern as invalid with TR. 2021-09-16 20:35:10 +01:00