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,422 Commits 46 Branches 9 Tags
70def8a31d8a28667c490b83ba2dabc826545000
Commit Graph

1125 Commits

Author SHA1 Message Date
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
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
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
b8b5cde1cd Add workaround with yarn inner classes 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-19 02:47:43 +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
2ec1dd032f Update tiny remapper, register the new LV pattern as invalid with TR. 2021-09-16 20:35:10 +01:00
shedaniel
eff1f8ba52 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingLayer.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.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/extension/MinecraftGradleExtension.java
#	src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
#	src/main/java/net/fabricmc/loom/util/TinyRemapperMappingsHelper.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
 2021-09-17 02:23:45 +08:00
modmuss50
2a040d03d7 Fix line number remapping not copying all class files. Fixes a runtime crash. 2021-09-16 16:23:33 +01:00
modmuss50
9d9be1b842 Migrate fully to mapping-io + Add comments about transitive access widners to generated sources (#495) 
* Add comments about transitive access widners to generated sources

* Migrate fully to mapping io

* Use release version of lorenz-tiny

* Review comment
 2021-09-16 15:28:06 +01:00
shartte
d48c74161e Access Widener 2.0 with support for Transitive Access Wideners (#484) 
* Added global access widener support.

* Adapt loom to changed API of latest AW PR.

* Fix expected access widener to fix the test. Since the access widener is now streamed directly into the writer, the expanded rules (i.e. accessible field makes the owning class also accessible) are no longer found in the remapped file.

* Add basic transitive accesswidener test

* Extracted applying transitive access wideners into their own jar processor since they also need to be applied if there is no AW in the mod itself.

* Misc assortment of fixes

* Set up the processor lazily to allow for adding the intermediary MC jar, which is needed to correctly remap intermediary AWs to named.

* Rework to setup the tiny remapper classpath with the mc jar
Add an extension prop to disable

* Add TransitiveDetectorVisitor

* Minor refactoring.

* Use release-version of access-widener.

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-09-14 22:40:47 +01:00
modmuss50
08e548b6c6 Expose layered mappings as an API (#490) 
* Expose layered mappings as an API

* Add FileSpec

* Cleanup and support DependencyFileSpec
 2021-09-13 17:58:52 +01:00
Juuxel
b7d1cf3a45 Fix aw2at tests, add Yarn 1.16 test (#45) 
* Fix aw2at tests

* Clean up the code anyway because it was messy

* Normalise everything to LF

* ...really, another typo?

* Import ordering

* Add Yarn aw2at test

* wow bad os
 2021-09-12 21:41:53 +08:00
Juuxel
4f2ead9f16 Remove unused Constants.SOFTWARE_COMPONENT_NAME (#493) 
This was a leftover from removed code, oops
 2021-09-12 11:39:12 +01:00
shedaniel
aad9582384 Fix some tests 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-12 03:06:21 +08:00
shedaniel
0f7a08750c Fix checkstyle 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-11 04:59:55 +08:00
shedaniel
aa4f1b107f Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-11 04:54:58 +08:00
shedaniel
d06081d560 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/future 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
 2021-09-11 04:24:40 +08:00
shedaniel
3bc5ab25c0 Compile to J11 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-11 04:19:51 +08:00