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,203 Commits 46 Branches 9 Tags
feature/113
Commit Graph

1203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shedaniel
53db9b3c25 Stub intermediaries 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-14 00:42:01 +08:00
shedaniel
2bdf2b3230 Add forgeExtra back to compile classpath 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-12 22:44:23 +08:00
shedaniel
14d4b4157d Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 2021-12-12 22:05:02 +08:00
Juuxel
1da4f6db84 Add forgeRuntimeLibrary configuration + some clean up (#64) 2021-12-11 19:28:06 +08:00
modmuss50
4eb0290bb4 Apply mitigation's against Log4J2 exploit CVE-2021-44228. 2021-12-10 10:59:14 +00:00
shedaniel
e00026ef46 Update TR 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-09 01:15:16 +08:00
shedaniel
d95f6a2a4c Patch ModDependencyInfo for fabric.mod.json check 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-08 22:03:21 +08:00
shedaniel
d654bf69b4 Merge remote-tracking branch 'architectury/dev/0.10.0' into dev/0.10.0 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-08 21:57:30 +08:00
shedaniel
261a42abde 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/configuration/mods/ModProcessor.java
 2021-12-08 21:55:57 +08:00
shedaniel
8e1006cde6 Update mercury 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-08 21:51:02 +08:00
shedaniel
a6a1d5d29b Move architectury.common.json check behind fabric.mod.json 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-08 21:38:24 +08:00
shedaniel
e546da570a Allow transitive access wideners to be declared through architectury.common.json (#61) 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-05 23:31:05 +08:00
shedaniel
3c8e1f8b31 Allow transitive access wideners to be declared through architectury.common.json 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-05 18:56:31 +08:00
Juuxel
ae383b8d4b Juuzify ArchitecturyLoomDecompiler (#60) 
* Juuzify ArchitecturyLoomDecompiler

* Remove unused max memory
 2021-12-05 01:53:32 +08:00
shedaniel
6a18e007a7 Add architectury decompiler (#59) 
* Add architectury decompiler

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

* Perhaps let's not include javaexec helpers

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

* Fix checkstyle and resolve reviews

Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-04 03:55:47 +08:00
modmuss50
b550ca7857 Validate remapped mods also have a remapped access widener. (#549) 
* Validate remapped mods also have a remapped access widener.

* Fix checkstyle
 2021-12-02 18:59:47 +00:00
shedaniel
537057bb61 Don't print unstable loom warning 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-02 02:10:32 +08:00
shedaniel
d3b041a9db Fix support for Forge 1.18 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-12-02 01:04:35 +08:00
shedaniel
152d2801e4 Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-11-29 01:54:17 +08:00
shedaniel
d51b44cdaa Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingLayer.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/mojmap/MojangMappingsSpec.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
 2021-11-29 01:49:31 +08:00
modmuss50
4b45783a54 Fix crash on Java 18 due to unpick using an outdated asm version. 
Unpick will now get the same version of asm that loom is running with on its classpath.
 2021-11-26 23:10:35 +00:00
modmuss50
60c908ea1b Fix duplicate comments about transitive access wideners. Fixes #544 
A more sophisticated fix might be nice, but im not sure it will provide a lot of benefit.
 2021-11-25 18:53:04 +00:00
modmuss50
7b28d61fab More improvements/fixes to shared caches maven publications + test improvements. 2021-11-25 14:49:17 +00:00
Juuxel
9ddff5f31a Fix gradle module metadatas not including api deps in runtimeElements (#540) 2021-11-23 18:35:08 +00:00
modmuss50
babbc55586 Add an option (enabled by default) to map synthetic field and method names from the official mojang mappings. (#538) 2021-11-20 21:46:33 +00:00
shedaniel
4765504fc1 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
 2021-11-18 02:35:59 +08:00
modmuss50
9c2b1e8d6d Fix access widener file hashcode calculation breaking caching. 
When using transitive access wideners the mc jar would always be re-processed.
 2021-11-17 15:30:23 +00:00
modmuss50
dd7882598e Add getBaseMappedJar to make it easier to get the pre-transformed game jar. 2021-11-15 13:42:07 +00:00
shedaniel
08aae05000 Revert "Fix unobfuscated names not having params or docs. (#532)" 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-11-14 20:41:14 +08:00
shedaniel
b7946e4ad5 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/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
 2021-11-13 00:40:44 +08:00
modmuss50
35afda4398 Fix namedElements not extending from api (#533) 
* Fix `namedElements` not extending from api
Fix artifact not waiting for remapAllJars with shared caches

* Use apiElements

* Add a better test for this.

* Also add remapped api mods to namedElements
 2021-11-12 10:46:23 +00:00
modmuss50
2994c2d488 Fix for 1.18-pre1 server bundler. 
In the bundler its called 1.18 Pre-release 1 not 1.18-pre1, so we just assume there is only ever going to be 1 version per jar.
 2021-11-11 18:28:15 +00:00
modmuss50
e2b4bc8985 Reduce log level of "Using project based jar storage". 
This will be used on a lot more projects now as transitive access wideners becomes more widely used.
 2021-11-10 17:42:41 +00:00
modmuss50
ba4b9289e2 Ensure that the encoding is set to UTF-8 2021-11-10 14:23:32 +00:00
modmuss50
b2228e3175 Fix unobfuscated names not having params or docs. (#532) 2021-11-09 22:07:43 +00:00
shedaniel
c412c11354 Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
 2021-11-06 17:19:57 +08:00
modmuss50
cb5c009e1a Fix missing blank line between javadoc and params 2021-11-01 18:30:42 +00:00
Cat Core
a91b75c05c Allow to set custom intermediary url again (#528) 
* allow to set custom intermediary url again

* apply suggestions

* add some javadoc
 2021-11-01 15:47:28 +00:00
modmuss50
5f379e4f42 Make CFR the default decompiler (#527) 
* Make CFR the default decompiler
Expose decompiler options

* Remove convention, default value is an empty map.

* Checkstyle..
 2021-11-01 13:43:03 +00:00
modmuss50
d01c20f049 Update cfr 2021-10-30 23:41:19 +01:00
shedaniel
a48989057d Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 2021-10-30 18:54:16 +08:00
Juuxel
587db4abae Add localRuntime and modLocalRuntime configurations (#526) 
Closes #481.

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-10-29 22:26:59 +01:00
modmuss50
e409f13b8c Add dev config with default jar task on it, to aid with depending on … (#525) 
* Add dev config with default jar task on it, to aid with depending on sub projects.

* Rename to `namedElements`

* Update src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java

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

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
 2021-10-29 13:29:29 +01:00
modmuss50
177264420e Fix misleading error message when decompiling fails. 2021-10-28 18:15:59 +01:00
shedaniel
e5478c1a76 Fix Gradle 8 deprecation 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-10-28 14:14:11 +08:00
shedaniel
70d4a1d691 Forgot to commit fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-10-27 12:04:17 +08:00
shedaniel
decdb1fd85 Require J16 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-10-26 21:20:52 +08:00
shedaniel
b23636065e Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0 
# Conflicts:
#	build.gradle
#	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/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/FileSystemUtil.java
#	src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
 2021-10-26 21:16:40 +08:00
shedaniel
5c190cc3ef Use NIO instead of ZipUtil (#513) 
* Use nio for zip utils

* Make tests work

* Please work

* Fix some issues with tests

* Fix more issues with tests

* NIOZipUtils -> ZipUtils

* Resolve Juuxel's reviews

* Use our own FS utils

* Improve error handling, add loom Pair

* Add Unit tests + fixes

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-10-26 13:08:17 +01:00
modmuss50
b7142ae468 Ensure path exists when loading transitive access wideners. 2021-10-25 18:13:28 +01:00