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,068 Commits 46 Branches 9 Tags
848a6a548f59161bbb7037965c366d167ce9be30
Commit Graph

1068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hanbings
b320c4199a Allow developer set the site where to download game resource.(0.9 branch) (#442) 
* Add mirrors util and mirror configuration

* Fix NPE in MirrorConfiguration;
Add constants in Constants;
Rename Mirrors.java to MirrorUtil.java

* Bump gradle nightly version

* Apply mirror to download assets.
Need fix settings in LoomRepositoryPlugin.java

* Fix MojangMappingsSpec having the same hash version for each mc version.

I dont think this would be a real cause for concern as the jar would have had the mc version in it anyway.

* Revert "Fix MojangMappingsSpec having the same hash version for each mc version."

This reverts commit 61fa4d9f

* Remove MirrorConfiguration and move to MirrorUtil

* StyleCheck.

* Fix "IllegalStateException: The root project is not yet available for build."

* Remove some of the extra content.

Co-authored-by: BreakIce <suibing112233@outlook.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-08-22 15:19:58 +01:00
Logic
9a470a49d8 update mapping-io, fix #473 (#474) 2021-08-22 15:03:09 +01:00
shedaniel
562be9280e Fix conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-14 15:06:22 +08:00
shedaniel
00d6ed71a1 Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java
#	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/extension/LoomGradleExtensionApiImpl.java
 2021-08-14 15:06:05 +08:00
shedaniel
6d9065eb1e Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future 
# Conflicts:
#	bootstrap/test-project/build.gradle
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
 2021-08-14 14:46:18 +08:00
shedaniel
97a629eef9 File Structure Changes (#462) 
* File Structure changes

* Fix checkstyle

* Fix processed jars

* Fix unpick tests

* Resolve reviews

* Fix merge conflicts
 2021-08-13 21:02:45 +01:00
shedaniel
57d5d20816 Fix checkstyle 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-14 02:50:23 +08:00
shedaniel
e130d9b12b Bump to 0.9.1 and fix conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-08-14 02:45:02 +08:00
shedaniel
83de8bbc9a 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/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/JarRemapper.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java
#	src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
#	src/main/java/net/fabricmc/loom/task/LoomTasks.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/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
#	src/test/resources/projects/kotlin/build.gradle.kts
 2021-08-14 02:31:16 +08:00
modmuss50
159e573cad Fix #469 (#470) 2021-08-11 22:08:36 +01:00
Juuxel
a0c2d877af Add modCompileOnlyApi, modRuntimeOnly; deprecate modRuntime (#458) 2021-07-31 23:46:42 +01:00
Juuxel
f9a06cbd41 Make RemapSourcesJarTask use properties (#459) 2021-07-31 23:45:43 +01:00