imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,004 Commits 46 Branches 9 Tags
dev/0.9
Commit Graph

1004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shedaniel
51eaff1f4a Change warning message to outdated loom 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-02 02:12:03 +08: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
modmuss50
d32acb3370 Bump gradle nightly version 2021-07-20 08:47:15 +01: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
b4ac68825f Enforce a minimum Intelij version of 2021.1. 
2021.1 is required for Java 16 and older versions have been known to cause crashes.
 2021-07-17 22:18:14 +01: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
d271dfadd0 Add CustomManifestTest 2021-07-16 22:59:37 +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
modmuss50
e3b2f8610e Update parchment url 2021-07-13 12:43:47 +01:00
shedaniel
ad3d7613b8 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-07-13 18:28:53 +08:00
Juuxel
f26e9e2c7b Fix AW field remapping (#434) 
* Fix AW field remapping

* Fix by updating TR instead

* Fix checkstyle so that tests run
 2021-07-13 08:52:42 +01:00
modmuss50
ad5ac78e06 Improve some bad stack traces. 
Idk why this happens.
 2021-07-13 00:05:33 +01:00
Juuxel
f13dc4eea7 Test AW field remapping (#433) 2021-07-12 23:39:32 +01:00
modmuss50
f3b336413c Fix header file from merge. 
I should have really waited for the PRs to be merged first thinking about it..
 2021-07-10 21:58:15 +01:00
Juuxel
e9657d63c4 Fix local file mod dependencies (#430) 
* ModProcessor: Add more descriptive error TR output error message

* Fix flatDir/files/fileTree mod dependencies

* Add clarifying comment

* Use hash as a placeholder version

* ProjectTestTrait: Copy instead of reading and writing text

This allows having jars and other binary data in tests.

* Add integration test for local file dependencies

* Use File.bytes instead of Files.copy

* Use truncated SHA256 instead of murmur3
 2021-07-10 21:52:38 +01:00
modmuss50
54fe0909ff Use spotless for header validation, years have been back-filled from git history 2021-07-10 21:50:53 +01:00
shedaniel
facd9d61a5 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
 2021-07-11 00:23:30 +08:00
modmuss50
b24e067215 Fix yet another gradle deprecation, expand tests to cover it 2021-07-05 23:04:08 +01:00
modmuss50
8ce991dadc Fix build... 2021-07-04 01:00:18 +01:00
modmuss50
3a51777b4b Use a detached configuration to add jetbrains annotations to the source remapper classpath. 2021-07-04 00:58:09 +01:00
modmuss50
5bccf43761 Update ReproducibleBuildTest hashes, the tiny remapper update caused this. 2021-06-30 22:54:42 +01:00
modmuss50
bed2031f3b Update ASM and nightly gradle 2021-06-30 22:33:17 +01:00
shedaniel
9729933433 Allow specifying multiple accesstransformers 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-30 19:26:03 +08:00
shedaniel
f49f0201c3 Merge branch 'arch-prs/at-refactor' into dev/0.9 2021-06-30 00:52:30 +08:00
shedaniel
9c95f9a900 Allow accessTransformer to be configured 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-30 00:43:26 +08:00
shedaniel
a9c11d2fde Use configurations to resolve special source 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-30 00:43:16 +08:00
Juuxel
80a412c8c0 Silence the AT tool properly 2021-06-29 13:49:58 +03:00
Juuxel
b59a01ffa7 Simplify patch version checks 2021-06-29 13:43:14 +03:00
Juuxel
21d6aba145 Clean up manifest handling by not copying the vanilla ones 2021-06-29 13:01:25 +03:00
Juuxel
f7731572d1 Fix "merging" the jar twice 2021-06-29 12:37:24 +03:00