Commit Graph

1106 Commits

Author SHA1 Message Date
Juuz
4369492b55 Make missing TR mapping namespace throw an exception instead of printing to stderr 2022-05-17 20:44:05 +03:00
Juuz
9c0b95860a Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0 2022-05-11 19:18:28 +03:00
modmuss50
9f341a9b47 Dont depend on other prepare tasks, only run after. (#637) 2022-05-10 23:22:01 +01:00
modmuss50
138685d141 Reduce log level when transitive access widener fails to find target method in mappings.
See: https://github.com/FabricMC/fabric-loom/issues/644
2022-05-10 19:37:00 +01:00
modmuss50
8c227a2d8c Fix/cleanup AP configuration name. (#643) 2022-05-10 19:31:21 +01:00
Juuz
b97def4e56 Remove workaround for #42
This is not relevant anymore as it has been
fixed in Forge. The code is reverted to how
it's in upstream Loom.

See MinecraftForge/MinecraftForge#8063.
2022-05-09 14:28:48 +03:00
Juuz
a9ece4ac48 Fix Kotlin remapper classloader 2022-05-08 19:38:16 +03:00
Juuz
b57f7dcc68 Fix Forge crashing because configurations haven't been set up
afterEvaluate is my passion
2022-05-08 19:12:46 +03:00
Juuz
45b69df11a Fix compilation and code style 2022-05-08 18:59:06 +03:00
Juuz
c35fa7f8f3 Merge remote-tracking branch 'upstream/dev/0.12' into dev/0.12.0
# Conflicts:
#	.github/workflows/test.yml
#	bootstrap/test-project/build.gradle
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
#	src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
#	src/main/java/net/fabricmc/loom/api/MixinExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.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/configuration/providers/minecraft/MinecraftJarConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/main/java/net/fabricmc/loom/util/ModUtils.java
#	src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataTinyRemapperExtensionImpl.kt
#	src/test/kotlin/net/fabricmc/loom/test/kotlin/KotlinClassMetadataRemappingAnnotationVisitorTest.kt
#	src/test/resources/projects/kotlin/build.gradle.kts
2022-05-08 18:36:35 +03:00
Emma C. Pointer-Null
5770b9a12d Improvements to Quilt JiJ (#83) 2022-05-08 16:57:17 +08:00
Juuxel
514ba75a1e Replace compile-time package access fixing on Forge with Unprotect (#84)
* Remove package access fixing

Requires Unprotect at runtime.

* Add Unprotect 1.0.0
2022-05-04 19:21:55 +08:00
Juuz
84a9b23df5 Aw2At: Fix incorrect AT for mutable fields
Fixes #76. Also introduces better tests
that cover this issue and the raw modifier
changes.
2022-05-03 13:56:31 +03:00
modmuss50
8b3bfde825 Add LibraryLocationLogger to help debug loom library version issues. 2022-05-01 13:26:03 +01:00
modmuss50
752c829eb0 Fix ModSettings not using a ConfigurableFileCollection :)
Need to add some tests for this ;)
2022-04-30 21:35:17 +01:00
Juuz
99235bcba9 Fix code style 2022-04-24 19:37:06 +03:00
NinjaPhenix
2df553a4cb Some minor bug fixes for iface injection & refmaps in mixins for quilt. (#81) 2022-04-24 20:41:45 +08:00
shedaniel
06b75b3439 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
2022-04-22 14:05:07 +08:00
KosmX
6ecaa609e8 Create MixinMappingsService for every target MC version. (#631)
* Create MixinMappingsService for every target MC version.

* Use mappings identifier to identify MixinMappingsService.
2022-04-21 20:55:37 +01:00
KosmX
9e57a4fc54 Create MixinMappingsService for every target MC version. (#631)
* Create MixinMappingsService for every target MC version.

* Use mappings identifier to identify MixinMappingsService.
2022-04-21 20:54:29 +01:00
modmuss50
1dfea9ef7e Add a FileCollection to ModSettings 2022-04-21 20:52:11 +01:00
shedaniel
7211c839fe Remap fabric mods on quilt as well
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-21 14:14:14 +08:00
shedaniel
73a09f5802 Make quilt mode suffix with _arch_quilt to not interfere with each other
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-21 14:14:07 +08:00
modmuss50
b7cdb718d7 Update to support 22w16a's arm64 macos natives, and tiny remapper. 2022-04-20 18:37:11 +01:00
shedaniel
47c44245be Add quilt mode
Squashed commit of the following:

commit 2f5cd64dd232996e92e8d1f71e6ce5deb747d247
Author: shedaniel <daniel@shedaniel.me>
Date:   Wed Apr 20 16:23:18 2022 +0800

    Make installer json ignore fabric's on quilt mode

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

commit 381b346c88f22f30acd9620f57f6ef03e6c50102
Merge: f272145a 1c48b6cb
Author: shedaniel <daniel@shedaniel.me>
Date:   Wed Apr 20 15:43:46 2022 +0800

    Merge remote-tracking branch 'architectury/dev/0.11.0' into feature/0.11.0-quilt

commit f272145a19949c72bf1ebdcec3f7c13ed498eb5a
Author: shedaniel <daniel@shedaniel.me>
Date:   Sat Apr 16 14:22:07 2022 +0800

    Match quilt-loom up to 44030f5d4659c425cb6f1450f46be5a0546964f2

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

commit 0e084be5e391e79a75467d1c9a56efd02821247a
Merge: 471d6a06 4a7a2660
Author: shedaniel <daniel@shedaniel.me>
Date:   Sat Apr 16 14:13:40 2022 +0800

    Merge remote-tracking branch 'architectury/dev/0.11.0' into feature/0.11.0-quilt

commit 471d6a065a18839bbd4d724d8f4383de53752e8b
Author: shedaniel <daniel@shedaniel.me>
Date:   Mon Mar 28 18:47:20 2022 +0800

    Add QMJ support

    Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-20 16:27:43 +08:00
modmuss50
f632dee2df Mod provided javadoc (#627) 2022-04-19 23:30:28 +01:00
modmuss50
29499fd0bd Workaround: https://github.com/gradle/gradle/issues/14727 2022-04-19 18:14:50 +01:00
modmuss50
5f5dfcb3a7 Add refmap target namespace property. (#628)
* Add refmap target namespace Property.

* Fix build.
2022-04-17 21:15:58 +01:00
modmuss50
0fda2a07bd Improve kotlin plugin version retrieval.
Update FLK in test.
2022-04-17 20:20:50 +01:00
modmuss50
ba2c98f7fd Run the kotlin metadata remapper in its own classloader with the compiler kotlin version. (#626) 2022-04-16 18:39:11 +01:00
shedaniel
1c48b6cbd9 Fix #79
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-04-16 15:19:23 +08:00
modmuss50
febc999092 Merge branch 'exp/0.12' into dev/0.12 2022-04-16 00:16:59 +01:00
modmuss50
463847184e Update mapping namespace manifest entry when remapping mod dependencies. 2022-04-16 00:14:42 +01:00
modmuss50
66ef9659a2 Fail hard with an error message when calling the wrong officialMojangMappings method.
Before this would have been a weird silent failure and resulted in bad mappings.
2022-04-16 00:06:56 +01:00
Jared
ff6e7a23b9 Ensure the Mojang maven repo is added before maven central. Close #621 (#625) 2022-04-13 23:35:27 +01:00
Jared
ccc70f134d Make run tasks use the correct path in multiproject environments. (#624) 2022-04-13 23:15:18 +01:00
modmuss50
007bc97c1b Update decompilers and mercury (JDT). 2022-03-30 18:11:47 +01:00
Cat Core
38675b4994 Fix another broken library pom (#616)
* Update MinecraftLibraryProvider.java

* Update LegacyProjectTest.groovy
2022-03-19 00:43:20 +00:00
shedaniel
d120159386 Merge remote-tracking branch 'FabricMC/dev/0.11' into dev/0.11.0 2022-03-17 02:46:54 +08:00
shedaniel
96a243e668 Merge remote-tracking branch 'architectury/dev/0.11.0' into dev/0.11.0 2022-03-15 00:31:20 +08:00
shedaniel
2e179471cb Fix #74
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-15 00:31:07 +08:00
modmuss50
0a8b792564 Add DSL to configure mod class path groups. (#608)
* Add basic mod settings.

* Cleanup and review feedback.

* Add idea output dir support.

* Eclipse and vscode + better tests.
2022-03-14 01:07:53 +00:00
Juuz
cb70b6468e Exclude org.ow2.asm from Forge maven repo
This should fix 1.3.2 and 1.4.7 or at the very
least get their tests to go further. Currently,
they hang when trying to download
org.ow2.asm:asm-all:4.1 from the Forge maven.
2022-03-09 03:22:26 +02:00
Juuz
50c1171d10 Fix part of #72
That was caused by two places resolving the configurations too early
before the mod processing had completed:

1. Forge sources remapper in Loom
2. Architectury plugin's runtime transformer file generation
   (see architectury/architectury-plugin#25)
2022-03-07 17:46:33 +02:00
Juuz
b1b77c008f Fix checkstyle 2022-03-07 12:28:13 +02:00
modmuss50
fff4afe405 Initial support for split client/common sourcesets. (#606) 2022-03-04 15:01:45 +00:00
shedaniel
817bdb9a32 Fix forge mixin remapping
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-04 09:45:59 +08:00
shedaniel
fb0f6badd5 Fix alfd-transformed affecting automatic module name generation
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-04 09:23:56 +08:00
shedaniel
55bb78a439 Fix missing forge jar prefix in Forge 1.16
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-03 10:18:33 +08:00
shedaniel
e38fa2ef72 Fix DependencyDownloader to not include two versions of the same dependency
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-03-02 11:34:39 +08:00