915 Commits

Author SHA1 Message Date
shedaniel
f2894a32f7 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 2022-07-03 17:53:01 +08:00
modmuss50
4ed3bdbb97 Actually handle gzip encoded connections when downloading. 2022-07-02 15:52:12 +01:00
shedaniel
0d1bb4c131 Add warning message for outdated loom
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-12-02 02:12:22 +08:00
modmuss50
7a7f7dc02e Update Mixin Compile Extensions to support upcoming mixin versions 2021-09-08 11:41:30 +01:00
modmuss50
5d0c8ab097 Fix usage of deprecated gradle features in UnpickJarTask 2021-07-17 21:56:20 +01:00
shedaniel
053f201e57 Avoid double brackets
Signed-off-by: shedaniel <daniel@shedaniel.me>
(cherry picked from commit 8a8b2d88e3)
2021-06-20 20:48:04 +08:00
shedaniel
a0057b8731 Disable failOnNonReproducibleResolution
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 02:26:42 +08:00
shedaniel
ac413d0d97 Fix missing pom patch
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-19 22:01:03 +08:00
shedaniel
600d461fd3 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8
# Conflicts:
#	.github/workflows/test-push.yml
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
2021-06-19 21:58:24 +08:00
modmuss50
581b04761d 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-18 00:08:12 +01:00
shedaniel
4ea60ed8cc Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8
# Conflicts:
#	build.gradle
2021-06-18 00:08:12 +08:00
shedaniel
99775c2069 Make compileForgeInjectJava build for Java 8
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-17 23:41:46 +08:00
modmuss50
3c42e92881 Patch all eclipse deps to use a strict version 2021-06-17 09:29:50 +01:00
modmuss50
74088b2ad4 Ensure deps are reproducible. This prevents them from being updated without us knowing. 2021-06-17 09:29:47 +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
6d815fc4d8 Remove redundant repo
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-14 02:01:28 +08:00
shedaniel
d8b3549f2f Merge remote-tracking branch 'architectury/dev/0.8' into dev/0.8 2021-06-14 01:56:00 +08:00
KosmX
3b30b035a4 Avoid half-broken forge maven (#27) 2021-06-14 01:54:57 +08:00
shedaniel
b645dfbb2b Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8
# Conflicts:
#	.github/workflows/test-push.yml
2021-06-14 01:02:19 +08: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
modmuss50
449868451e Run tests on windows 2021-06-13 10:50:17 +01: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
58347914b5 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 2021-06-03 23:18:37 +08:00
modmuss50
4763760984 Revert "Update mercury (#408)"
This reverts commit 50d6fd298d.
2021-06-02 23:05:51 +01:00
modmuss50
50d6fd298d Update mercury (#408) 2021-06-02 09:06:26 +01:00
modmuss50
188bbe57d6 Fix MergedNestedJarProvider not calling the child's prepare 2021-06-01 18:13:59 +01:00
shedaniel
b4b2e986d1 Reinitiate the forge repo
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-30 20:47:03 +08:00
shedaniel
a2ae80239d Disable module files, we can't have those, they point to the wrong files
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-30 20:46:50 +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
640e1b4721 Improve the outdated Java error message when syncing in idea. 2021-05-26 21:10:08 +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
modmuss50
de665ab498 Add SignedProjectTest #404 2021-05-20 23:47:48 +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
5fe4204b97 Disable shadowJar, where did that come from
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-14 18:55:12 +08: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
432e88f354 Add a simple java 16 project test 2021-05-12 19:03:59 +01:00
modmuss50
9303dc39c3 Cleanup merged jar on failure 2021-05-12 19:03:42 +01:00
modmuss50
943477143a Update stitch 2021-05-12 19:03:22 +01:00