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
953 Commits 46 Branches 9 Tags
bfc2c06822626806764daeec2d5e3014932ae758
Commit Graph

739 Commits

Author SHA1 Message Date
Juuxel
bfc2c06822 Merge remote-tracking branch 'upstream/dev/0.9' into arch-prs/at-refactor 
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
 2021-06-29 12:10:42 +03:00
shedaniel
ba9e99d9f1 Implement "Loom-Patch-Version" 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-29 16:59:37 +08:00
Juuxel
f240b0f39f Fix the previous 2021-06-29 01:12:52 +03:00
Juuxel
2a47b28fde Ignore Forge name mapping service provider 2021-06-29 00:15:16 +03:00
Juuxel
8146d775a1 net.fabricmc.loom.inject -> dev.architectury.loom.forgeruntime 2021-06-28 22:52:43 +03:00
Juuxel
ae5bc4df15 Separate Forge runtime into its own subproject 2021-06-28 22:44:02 +03:00
shedaniel
9d31be3729 Fix mergeAndSaveMappings logic 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-25 02:59:18 +08:00
shedaniel
f3bf0a4207 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilder.java
 2021-06-20 20:24:40 +08:00
shedaniel
54d6ef7896 Fix typo "officalMojangMappings" (#420) 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 13:24:10 +01:00
shedaniel
4dba17310d Add crane support 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 20:08:13 +08:00
shedaniel
076cda371c Make mojang mappings stable by implementing a custom license supplier 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 18:47:13 +08:00
shedaniel
10d810fad1 Readd silenceLicense 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-20 02:26:17 +08:00
shedaniel
4b1f5cc127 Merge remote-tracking branch 'architectury/dev/arr2' into dev/0.9 2021-06-19 22:06:52 +08:00
shedaniel
1f93aab9d8 Reapply some patches 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-18 00:04:58 +08:00
shedaniel
24a515270a 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/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MojangMappingsDependency.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
 2021-06-17 23:44:48 +08:00
shedaniel
ce3c96ca86 Merge branch 'dev/0.8' into dev/0.9 2021-06-17 23:42:04 +08:00
modmuss50
1f9f48052b Basic layered mappings with @ParchmentMC support (#413) 2021-06-14 18:39:03 +01:00
shedaniel
1ea5dbb1e8 Try switching to a regex and exclude in the repo that loom adds 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-14 02:16:12 +08:00
shedaniel
c80dc12dc4 Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9 
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
 2021-06-14 02:02:43 +08:00
haykam821
60482833b2 Use tabs for indentation in the Fernflower decompiler (#383) 
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-06-13 14:34:46 +01:00
modmuss50
9278f6c4b9 Fix new gradle 8.0 deprecation added in 7.2 (#416) 
* Fix new gradle 8.0 deprecation added in 7.2

* Handle bootstrap tests a bit better

* Fix 0.9 wrapper tests
 2021-06-13 13:28:47 +01:00
modmuss50
0cfa88f73b Always fork the java compiler 2021-06-13 11:23:46 +01:00
KosmX
90c55b66f7 Name mappings, so I can work with multiple Minecraft versions at the same time (#26) 
* Name mappings, so I can work with multiple Minecraft versions at the same time

* Update MojangMappingsDependency.java

* Update MojangMappingsDependency.java

Co-authored-by: shedaniel <daniel@shedaniel.me>
 2021-06-13 18:13:46 +08:00
shedaniel
29822d0911 Use a better structure for the mappings folder 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-06 23:49:16 +08:00
shedaniel
1212e56d9c Detect tsrg2 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-05 01:55:26 +08:00
shedaniel
58347914b5 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 2021-06-03 23:18:37 +08:00
modmuss50
188bbe57d6 Fix MergedNestedJarProvider not calling the child's prepare 2021-06-01 18:13:59 +01:00
Juuz
1f9872d4ff whatever I did yesterday 2021-05-31 12:14:43 +03:00
Juuz
a971942e2b Reorder MinecraftPatchedProvider pipeline 
The merging was moved before the AT to reduce ATing and remapping.
 2021-05-30 21:25:22 +03:00
Juuz
af3f287fc4 Migrate ATs to JavaExec and make them quiet 2021-05-30 21:06:01 +03:00
shedaniel
b4b2e986d1 Reinitiate the forge repo 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-30 20:47:03 +08:00
shedaniel
6bdfabc228 Update tiny-remapper to 1.1.0 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-30 19:57:35 +08:00
shedaniel
a4c72b6f03 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	settings.gradle
#	src/test/groovy/net/fabricmc/loom/test/integration/dependencyResolutionManagement.groovy
 2021-05-30 19:17:56 +08:00
modmuss50
210938d749 Fix local ivy layout not respecting classifiers. Fixes #407 2021-05-28 11:31:19 +01:00
modmuss50
3318a15cc5 Suppress "Inconsistent inner class entries" error when decompiling 2021-05-27 22:08:56 +01:00
modmuss50
8238db1778 Improve error messages when using outdated Java or Gradle. 2021-05-26 11:41:52 +01:00
Mitchell Skaggs
1f80e00e88 Add classifier to "fake" mods' id if they have a classifier specified (#394) 
* Remove unused codepath (`RemapJarTask` is an `AbstractArchiveTask`)

* Remove incorrect comment

Comment originally added in 02e9616622

* Add classifier to `DependencyInfo`

* Add classifier to generated mod ID

* Clean up code structure from review

Co-authored-by: haykam821 <haykam821@users.noreply.github.com>

* Inline `file` local variable

Co-authored-by: haykam821 <haykam821@users.noreply.github.com>

Co-authored-by: haykam821 <haykam821@users.noreply.github.com>
 2021-05-22 23:29:02 +01:00
LogicFan
e955ebb8c5 add support for new dependencyResolutionManagement (#400) 
* move repo declartions

- Move repository declartions in MavenConfiguration.java to LoomRepositoryPlugin.java

* move repo declartions

- Move repository declartions in MinecraftMappedProvider.java to LoomRepositoryPlugin.java

* move repo declartions

- Move repository declarations in MinecraftProcessedProvider.java to LoomRepositoryPlugin.java

* do not add repositories if dependencyResolutionManagement is used

* Simplify the change on LoomGradlePlugin

- this is the suggestion from liach

* change name to follow fabric naming convension

- change getProjectUUID to getProjectUuid
- change PROJECT_MAPPED_CLASSIFIER to projectMappedClassifier

* remove MavenConfiguration.java

- the file currently do nothing.

* clean-up for all `instanceof` clause

* add DependencyResolutionManagementTest

* code cleanup

* Update src/test/resources/projects/dependencyResolutionManagement/projmap/src/main/resources/modid.accesswidener

* change project uuid to project full name

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-05-22 23:28:42 +01:00
shedaniel
5692cb277c Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
 2021-05-20 22:20:38 +08:00
modmuss50
93b2aebaf8 Update MCE to 0.4.4 2021-05-18 21:00:08 +01:00
modmuss50
90ff811ecd Make the run config api stable 2021-05-15 19:58:08 +01:00
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