300 Commits

Author SHA1 Message Date
shedaniel
711212b2a9 Fix license headers
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-13 22:40:52 +08: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
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
bed2031f3b Update ASM and nightly gradle 2021-06-30 22:33:17 +01:00
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
Juuxel
ae5bc4df15 Separate Forge runtime into its own subproject 2021-06-28 22:44:02 +03:00
shedaniel
8a8b2d88e3 Avoid double brackets
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 20:47:18 +08:00
shedaniel
44ea5602fd Merge remote-tracking branch 'architectury/dev/0.8' into dev/0.9
# Conflicts:
#	build.gradle
2021-06-20 20:10:47 +08: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
9313da0824 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.9
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
2021-06-20 02:27:30 +08:00
shedaniel
a0057b8731 Disable failOnNonReproducibleResolution
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 02:26:42 +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
ac413d0d97 Fix missing pom patch
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-19 22:01:03 +08: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
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
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
modmuss50
147af48879 Patch all eclipse deps to use a strict version 2021-06-16 23:16:44 +01:00
modmuss50
b4cd38a287 Ensure deps are reproducible. This prevents them from being updated without us knowing. 2021-06-16 19:16:47 +01:00
modmuss50
1f9f48052b Basic layered mappings with @ParchmentMC support (#413) 2021-06-14 18:39:03 +01:00
modmuss50
e179cccf64 Update Tiny Remapper to 0.4.2 2021-06-14 08:49:43 +01:00
modmuss50
75aca3b870 0.4.1 tiny remapper 2021-06-13 22:46:00 +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
shedaniel
6d815fc4d8 Remove redundant repo
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-14 02:01:28 +08:00
KosmX
3b30b035a4 Avoid half-broken forge maven (#27) 2021-06-14 01:54:57 +08:00
modmuss50
3d3628f0a1 Update tiny remapper. 2021-06-13 17:49:18 +01:00
modmuss50
8d2e8c5948 Start 0.9 dev cycle 2021-06-13 11:18:10 +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
1212e56d9c Detect tsrg2
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-05 01:55:26 +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
Juuz
af3f287fc4 Migrate ATs to JavaExec and make them quiet 2021-05-30 21:06:01 +03: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
8238db1778 Improve error messages when using outdated Java or Gradle. 2021-05-26 11:41:52 +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
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
943477143a Update stitch 2021-05-12 19:03:22 +01:00
modmuss50
429d2dadb1 Start 0.8 dev cycle 2021-05-12 16:24:06 +01:00