imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 21:47:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
874 Commits 46 Branches 9 Tags
dd5e6df3aeff2fd63b4c3f42eca445d2f52caa34
Commit Graph

692 Commits

Author SHA1 Message Date
shedaniel
dd5e6df3ae Fix merge conflicts 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-14 06:56:18 +08:00
shedaniel
ec2b47fa14 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 
# Conflicts:
#	README.md
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
#	src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
 2021-05-14 06:43:07 +08:00
shedaniel
7d38e3bc9a Merge remote-tracking branch 'FabricMC/future/dev' into dev/0.8 2021-05-14 06:40:13 +08:00
modmuss50
9fb167d506 General cleanup by making use of java 16 features (#397) 
* General cleanup by making use of java 16 features

* use jackson-databind in place of gson when reading to a record

* Fixes

* cleanup

* dep updates

* Replace commons IOUtils usage with native java

* Update fernflower
 2021-05-13 22:06:34 +01:00
modmuss50
2f38c747a1 Catch all when merging jars 2021-05-12 20:31:05 +01:00
modmuss50
258578f142 Update MCE to 0.4.3 2021-05-12 20:08:55 +01:00
modmuss50
9303dc39c3 Cleanup merged jar on failure 2021-05-12 19:03:42 +01:00
modmuss50
63bf3aaaa4 Enable ShowCodeDetailsInExceptionMessages (Better null pointers) for all run configs 2021-05-12 16:01:00 +01:00
shedaniel
04fdf68d99 There is nothing lazy about this that makes this a lazy configuration 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-12 21:49:59 +08:00
shedaniel
85960a164a Merge remote-tracking branch 'FabricMC/future/dev' into dev/future 
# Conflicts:
#	.github/workflows/test-push.yml
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
 2021-05-12 21:44:59 +08:00
shedaniel
855836b972 Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-12 21:43:28 +08:00
shedaniel
7f32844bdb Don't remap forge sources on a CI build 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-11 00:57:03 +08:00
shedaniel
3ae05747f5 Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forge 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
 2021-05-10 23:13:25 +08:00
shedaniel
3364e7ae64 Add detection for "architectury.common.marker" to remap 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-10 23:12:54 +08:00
shedaniel
8ef33a9d5e Add license 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-08 19:50:58 +08:00
shedaniel
9d19ab4c2e Small cleanup + Use MappingsUtils for reordering 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-08 19:15:21 +08:00
shedaniel
017e09cf52 Fix jar output location 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-08 19:14:11 +08:00
shedaniel
3570137e07 Setup empty launch settings 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-08 17:25:47 +08:00
shedaniel
3f576a44ab Migration Mappings Detection 
Still having issues with source locations, would need to check it out first

Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-08 12:50:17 +08:00
shedaniel
d91d7c096c Revert "Filter ':launcher' dependency (Could cause problems! Please test!)" 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-05 21:42:03 +08:00
shedaniel
2625b90a17 Adds Forge Sources Remapping 
Filter ':launcher' dependency (Could cause problems! Please test!)
Fix previous optimisations leaving signing info in
Add license header to various files

Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-05 18:29:42 +08:00
modmuss50
927180e36b Make all loom added configurations lazy 2021-05-04 20:06:24 +01:00
shedaniel
68028031ba Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-05 02:37:40 +08:00
shedaniel
8d96bc0b6f Use "loom.platform" instead of "loom.forge" 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-05 02:34:03 +08:00
shedaniel
aba834b040 Merge remote-tracking branch 'FabricMC/future/dev' into dev/future 
# Conflicts:
#	.github/workflows/test-push.yml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
 2021-05-05 02:21:49 +08:00
shedaniel
f0ec1b61dd Merge remote-tracking branch 'FabricMC/future/dev' into dev/future 
# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
 2021-05-05 02:20:20 +08:00
modmuss50
7ce072c47a Fix gradle 8 deprecation warning 2021-05-04 19:19:02 +01:00
modmuss50
a5bc38a940 Make remapped configurations lazy 2021-05-04 19:07:21 +01:00
modmuss50
be0444d261 Merge branch 'dev/0.7' into future/dev 
# Conflicts:
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
 2021-05-04 18:29:00 +01:00
shedaniel
da286b6c86 Change plugin ID to "dev.architectury.loom" 2021-05-03 18:40:02 +08:00
shedaniel
6f2ec219e7 Use TinyRemapper directly 2021-05-01 21:16:42 +08:00
shedaniel
77e71acd99 a 2021-05-01 19:40:27 +08:00
shedaniel
c28fe56870 Merge remote-tracking branch 'architectury/dev/0.7-forge' into feature/perf 2021-04-30 10:38:28 +08:00
shedaniel
f9ba0104d1 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-30 10:06:21 +08:00
Username404-59
cc13624989 Workaround for FileSystemAlreadyExists errors (#17) 2021-04-30 00:38:27 +08:00
shedaniel
162a903423 Change MavenConfiguration's forge maven 2021-04-29 20:13:31 +08:00
Username404-59
4d10953278 Fix displayed forge version when using prefix-ranges in dev environments and fix the forge repo url too (#16) 
* Fix displayed forge version when using prefix-ranges in dev environments

* Fix the forge repo url
 2021-04-29 20:12:32 +08:00
shedaniel
e05c885508 Change MavenConfiguration's forge maven 2021-04-29 20:12:18 +08:00
Username404-59
d276b4f19b Fix displayed forge version when using prefix-ranges in dev environments and fix the forge repo url too (#16) 
* Fix displayed forge version when using prefix-ranges in dev environments

* Fix the forge repo url
 2021-04-29 20:10:09 +08:00
modmuss50
974cd1fa6c Update MCE to 0.4.3 2021-04-28 22:50:53 +01:00
modmuss50
7de021e7c1 Revert "Update MCE" 
This reverts commit b85659640d.
 2021-04-27 18:04:47 +01:00
shedaniel
4c94886db8 Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge 2021-04-27 20:55:19 +08:00
modmuss50
f409116afd Merge branch 'dev/0.7' of github.com:FabricMC/fabric-loom into dev/0.7 2021-04-27 13:13:15 +01:00
modmuss50
b85659640d Update MCE 2021-04-27 13:12:01 +01:00
shedaniel
001f4b58f6 Performance Optimisations on Project Setup 
"Sorry I kinda put them into a single commit" - shedaniel

- Fix AtRemapper into not using ZipUtil#transformEntries, which is slow as it transverses the whole zip tree
- Optimises InnerClassRemapper into not using ZipUtil#iterate, which provides the InputStream of the ZipEntry, data that we don't utilize. Switch to a simple FileSystem to traverse through the list of files
- Make MappingsProvider respect mergedv2 yarn files, skipping merging and reordering namespaces in the process. Users that wish to benefit from this should switch to using mergedv2 yarn artifacts
- Make MinecraftMappedProvider only read inputs once
- Replace (TinyRemapper, official -> named) to (AsmRemapper, intermediary -> named), and chain it to the (TinyRemapper, official -> intermediary) to avoid reading the Minecraft jar again
- Multi-thread MinecraftPatchedProvider#fixParameterAnnotation properly

On a typical project, these changes can save up to 50% of the import time. Tested on architectury example mod, which brought import times from 1m 51s to 48s.
 2021-04-22 23:41:35 +08:00
ByMartrixX
1d009e155e Add loom development dependencies to test runtime classpath (#389) 2021-04-21 08:51:56 +01:00
shedaniel
b200c4ff62 Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forge 2021-04-17 22:38:11 +08:00
modmuss50
12ac6cfcfe Update mixin-compile-extensions 2021-04-14 20:45:17 +01:00
shedaniel
8f6de9af84 Add more logging to JarRemapper 2021-04-14 09:39:06 +08:00
shedaniel
aa009c2b2d Add "loom.forge.include" for include configuration on forge 2021-04-14 08:45:26 +08:00