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
1,080 Commits 46 Branches 9 Tags
6f9fb64e341aa1bef772b21676044c5a2b46358e
Commit Graph

1080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
848a6a548f Fix FabricAPITest 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-12 04:20:37 +08:00
shedaniel
8bebf7d3ea Make test matrix recursive 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-12 03:52:53 +08:00
shedaniel
d13af87694 Fix codenarc styling 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-12 03:35:37 +08:00
shedaniel
29f38b1d28 Merge two tests 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-12 03:15:45 +08:00
shedaniel
aad9582384 Fix some tests 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-12 03:06:21 +08:00
shedaniel
43dda4a6c8 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 2021-09-12 03:02:32 +08:00
shedaniel
df7f56306b Fix ParchmentMappingLayerTest test (#491) 
* Fix ParchmentMappingLayerTest test

* Update mapping-io

* Remove comment
 2021-09-11 14:39:19 +01:00
shedaniel
014562d166 Fix codenarc 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-09-11 14:23:37 +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
Juuxel
e1f5f3d6eb Convert AWs on Forge to ATs in RemapJarTask (#24) 
* Aw2At

* Hook Aw2At up to remapJar

* Checkstyle

* Checkstyle, part II

* Now it's Spotless' turn

* Remap the resulting AT

* you see, this is why mojmap is bad

* Inject(method = "<init>")

* Use file systems because ZipUtil is bad

* Make it false by default

* Add integ tests for aw2at

* spotless please

* fix year
 2021-09-11 02:08:41 +08:00
modmuss50
2c464cdef3 Add loom.modVersion to read the version from the fabric.mod.json file. (#489) 2021-09-10 16:06:37 +01:00
modmuss50
2bc7522a26 Fix reproducible build test, a none legacy test for this should be added at a later date. 2021-09-08 15:59:31 +01:00
modmuss50
1818ff03ab Update dependencies 2021-09-07 12:31:16 +01:00
modmuss50
aaf8653bee Disable ANSI when gradle's --console plain arg is used Fixes #486 2021-09-07 12:24:57 +01:00
modmuss50
8da2da8aed Update checkstyle to prevent using var expect for new instance creation. 2021-09-07 11:55:05 +01:00
modmuss50
5837f95ff8 Fix line endings in fapi patch 2021-09-07 11:30:10 +01:00
Logic
3b0dc7f0f4 Use tiny-remapper to remap mixin annotation. (#441) 
* use tiny-remapper 0.5.0

* add property of useLegacyMixinAp and rename mixin to mixinAp

* disable mixin ap if useLegacyMixinAp is false

* fix tests

* remove experimental for mixinAp

* enable mixin remapper

* revert changes on API

* rename MixinAp*** to Mixin***

* move useLegacyMixinAp inside MixinExtension

* cleaner code

* update test

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-09-07 11:28:51 +01:00
modmuss50
52873435b7 Fix fabric api build test 2021-09-07 11:20:54 +01:00
Juuxel
ea8ee4c21a Add option to disable deprecated POM generation and the warnings together with it (#487) 2021-09-05 17:55:42 +01:00
modmuss50
1a060df4bf Revert fabric api patch to fix deprecations, I believe loom is wrong. 2021-09-05 17:06:26 +01:00
modmuss50
216b48337b Fix crash when "sourcesElements" is not present 2021-09-05 17:06:05 +01:00
modmuss50
ffaf893716 Patch fabric api to fix loom deprecations 2021-09-05 16:38:11 +01:00
modmuss50
2bdeb869ab Update MCE and test deps 2021-09-05 16:22:51 +01:00
shedaniel
0633b170fa Make parchment layer test also test the parameter after being reordered (#483) 
* Make parchment mappings layer test also test the parameter after being reordered.

* Switch to using hashCode
 2021-09-05 16:08:43 +01:00
Juuxel
08f055489b Fix the java software component not working with Loom and fix #200 (#460) 
* Add modCompileOnlyApi, modRuntimeOnly; deprecate modRuntime

* begin

* continue

* Make RemapSourcesJarTask use properties

* finish

* Remove cursed version hack 😉

* Finish for real

* Add missing header

* Clarify a comment

* Fix tests

* Use Gradle's own *Elements and remove -dev jars

* Fix maven test

* Put mappingsFinal onto runtimeClasspath instead of implementation

* Make non-mod dependencies work with the legacy pom magic too

* Be a bit more clever when removing dev artifacts
 2021-09-05 16:08:16 +01:00
modmuss50
b1b395cedf Revert "Make SourceRemapper threaded (#446)" 
This reverts commit ef2816b0d0.
 2021-09-02 12:50:56 +01:00
shedaniel
6165576521 Make --refresh-dependencies work by creating the directory after clearing it (#482) 2021-08-31 14:54:17 +01:00
modmuss50
3ded0964c4 Refactor and improve tests (#466) 
* Install and run a production server in tests

* Small improvements

* Add FabricAPI build test
Create new GradleProjectTestTrait replacing the old trait
Improve groovy code formatting.

* Refactor tests

* Fix MultiProjectTest + fix logging for fabric api test

* Cleanup and fixes

* Update fabric api + run in parallel for speed

* Set server memory + fix error
 2021-08-31 11:48:58 +01:00
shedaniel
aaacd23c8b Make it work 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-31 18:24:42 +08:00
shedaniel
9366d42baa Start work on porting 0.7.4 over 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-30 14:10:32 +08:00
shedaniel
d819b1cc47 Make LayeredMappingsDependency not error because of uninitialized MappingsProvider 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-26 21:50:19 +08:00
shedaniel
2277b93f8d Fix compile for b320c4199a (#480) 
* Fix compile for b320c4199a

* Fix checkstyle
 2021-08-26 11:22:55 +01:00
shedaniel
960c7de6e4 Merge remote-tracking branch 'shedaniel/patch-2' into dev/future 2021-08-26 17:54:48 +08:00
shedaniel
eff967c091 Fix compile for b320c4199a 2021-08-26 17:52:47 +08:00
shedaniel
3de33252b7 Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
 2021-08-26 17:45:04 +08:00