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,031 Commits 46 Branches 9 Tags
3de33252b7000374b7cc86568ab99945a432d50a
Commit Graph

806 Commits

Author SHA1 Message Date
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
Logic
2f4cf35abf Remove the Cache class in the LoomRepositoryPlugin, use LoomFiles instead. (#464) 
* refactor LoomFiles to support Settings

* remove Cache class, use LoomFiles class

* fix checkstyle
 2021-07-31 23:43:46 +01:00
modmuss50
e5b972cf98 Remove the ShowCodeDetailsInExceptionMessages jvm arg, I didn't realise it was default to enabled now. 2021-07-31 23:41:31 +01:00
modmuss50
2b5d3d4a3a Revert: "Always fork the java compiler" Fixes #453 
This reverts 0cfa88f73b as it causes OOM issues when building fabric api.
 2021-07-28 18:19:56 +01:00
Logic
e124d48387 fix #448 (#451) 
* fix #448

* minor fix
 2021-07-28 08:50:14 +01:00
modmuss50
32837d71eb Fix NPE when in a mod loader dev env 2021-07-27 20:56:24 +01:00
Juuxel
b955affb1a Expose 'loom' extension as the API, deprecate 'minecraft' extension (#449) 2021-07-26 20:20:23 +01:00
shedaniel
75234f4cbd Use Property in LoomGradleExtension & Move task groups to constants (#445) 
* Use Property in LoomGradleExtension

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Fix customMinecraftManifest

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Add deprecation messages, let's wait for the tests to run to fix the tests that are using deprecated apis

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Apply license

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Update src/main/java/net/fabricmc/loom/util/DeprecationHelper.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* Fix some tests, move mixinRefmapName -> mixin.defaultRefmapName

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Move back to the api

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Fix some tests

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Apply reviews

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Update src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-07-26 20:08:03 +01:00
Juuxel
b558ee1a46 Fix loom.accessWidener being a read-only property in Kotlin (#447) 
* Re-enable Kotlin test because the related bug has been fixed

* Fix loom.accessWidener being a read-only property in Kotlin

* Remove Kotlin test exclusions
 2021-07-26 12:14:31 +01:00
modmuss50
ef2816b0d0 Make SourceRemapper threaded (#446) 
Should be a little bit faster, but nothing magicial.
 2021-07-25 22:54:22 +01:00
Juuxel
08a797c53b Use jar processor ids to fix #432 (#444) 
* Use jar processor ids to fix #432

* Use full hash string of jar processor ids
 2021-07-23 21:51:34 +01:00
modmuss50
606046e719 Ensure files are closed and outputs cleaned up when remapping. 2021-07-23 21:22:59 +01:00
modmuss50
e6793b5ed7 Revert "Fix MojangMappingsSpec having the same hash version for each mc version." 
This reverts commit 61fa4d9f
 2021-07-21 23:30:40 +01:00
modmuss50
61fa4d9fb6 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.
 2021-07-21 22:29:23 +01:00
shedaniel
ab4ae39664 Merge remote-tracking branch 'architectury/dev/0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
 2021-07-20 23:48:33 +08:00
shedaniel
f971bce5e2 Fix the return value of "net.fabricmc.loom.LoomGradleExtension.getInstallerData()" is null 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-20 23:47:20 +08:00
shedaniel
695863367f Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-20 23:44:11 +08:00
shedaniel
cea80b0119 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.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/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.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/task/GenerateSourcesTask.java
 2021-07-20 18:03:33 +08:00
shedaniel
9d0f652669 Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-20 17:47:49 +08:00
shedaniel
07bc4eab7b Merge branch 'upstream-0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
 2021-07-20 17:44:04 +08:00
shedaniel
3a354be4d7 Don't read the intermediary file immediately 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-20 17:41:06 +08:00
shedaniel
49d05ad42d Give a proper working directory for GradleMappingContext 
Signed-off-by: shedaniel <daniel@shedaniel.me>

(cherry picked from commit 5eafbbceeb)
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-20 17:33:35 +08:00
shedaniel
ab351ee8c0 Move the forge jar to prevent #35 
Signed-off-by: shedaniel <daniel@shedaniel.me>
(cherry picked from commit a162373fa1)
 2021-07-20 17:32:51 +08:00
LogicFan
81fa551382 Better Mixin AP configuration (#423) 
* [SPON-15] Apply Mixin AP config for all projects.

* Revert "[SPON-15] Apply Mixin AP config for all projects."

This reverts commit 93576e83b1221949d551b6307938f7dd6dc8fbbe.

* use setter & getter

* fix broken test introduced in 54d6ef7896

* initial commit for mixin extension

* refactor getConfiguration

* apply mixin extension

* [SPON-15] allow across project AP config

* [SPON-15] revert some changes

* [SPON-15] refactor codes

* [SPON-15] fix bugs

* [SPON-15] bring back cross-project apconfig

* [SPON-15] bug fix: move add default sourceSet earlier

* [SPON-15] fix style

* [SPON-15] refactor MixinAPExtension

* add test

* update test

* [SPON-15] fix test

* Update MixinAnnotationProcessorExtension.java

* [SPON-15] fix test

* fix deprecated gradle API

* [SPON-15] refactor ApInvoker

* [SPON-15] refactor ApInvoker

* allow change refmap name in sourceSet bases

* add new condition on test

* [SPON-15] fix wrong suffix

* Revert "[SPON-15] fix wrong suffix"

This reverts commit 98910392d91c26cd0454cca8cfc03c4e3d417fd6.

* fix mixinjson suffix

* use stream instead of collection for mixin json name

* change name for function

* use correct auto-refmap

* fix file name

* add with action

* add test

* refactor some codes

* refactor code

* update test

* fix checkstyle

* better error message

* fix checkstyle

* remove corss project option

* allow mixin inside loom

* remove project0

I should remove all project0. If I forget one please tell me.

* move `mixin` inside `loom`

* fix spotless

* merge attempt

* fix checkstyle

* seperate api & impl

* add experimental annotation for API

* use API

* Fix indentation

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* fix typo

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* fix typo

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

* better javadoc

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
 2021-07-18 14:13:47 +01:00
shedaniel
3761a59064 Fix java.nio.file.FileAlreadyExistsException: META-INF/MANIFEST.MF 
Signed-off-by: shedaniel <daniel@shedaniel.me>
(cherry picked from commit e9ccf5af91)
 2021-07-18 19:45:24 +08:00
modmuss50
a73696a83f Fix fabricApi.module does not respecting offline mode. Closes #412 2021-07-16 23:25:23 +01:00
modmuss50
69caaccb07 Fallback to fabric's experimental version manifest for versions that are not in the launchermeta. 2021-07-16 23:22:03 +01:00
modmuss50
34b771f744 Actually handle gzip encoded connections when downloading. 2021-07-16 22:48:50 +01:00
modmuss50
777f30913b Add back customManifest api 2021-07-16 22:36:22 +01:00
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
modmuss50
e439a1b354 Refactor LoomGradleExtension (#431) 
* First pass at refactoring the extension

* Fix inital issues.

* Combine some interfaces

* Checkstyle

* Fix years

* Add isShareCaches to api
 2021-07-14 00:03:21 +01:00
modmuss50
2259a4efc8 Add versions used to compile/build against to jar manifest (#428) 
* Add versions used to compile/build against to jar manifest

* checkstyle

* Move to post remap

* Fix build

* Add mc version and mixin group

* Typo

* Make test run across versions better.
 2021-07-13 23:10:07 +01: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