From 3b0dc7f0f41050b0d165102e88d05d5b08f7b33a Mon Sep 17 00:00:00 2001 From: Logic <38597904+LogicFan@users.noreply.github.com> Date: Tue, 7 Sep 2021 06:28:51 -0400 Subject: Use tiny-remapper to remap mixin annotation. (#441) * use tiny-remapper 0.5.0 * add property of useLegacyMixinAp and rename mixin to mixinAp * disable mixin ap if useLegacyMixinAp is false * fix tests * remove experimental for mixinAp * enable mixin remapper * revert changes on API * rename MixinAp*** to Mixin*** * move useLegacyMixinAp inside MixinExtension * cleaner code * update test Co-authored-by: modmuss50 --- .../fabricmc/loom/configuration/CompileConfiguration.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java') diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index f572d31a..81f8bf4c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -39,7 +39,7 @@ import net.fabricmc.loom.configuration.ide.SetupIntelijRunConfigs; import net.fabricmc.loom.configuration.providers.LaunchProvider; import net.fabricmc.loom.configuration.providers.MinecraftProviderImpl; import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; -import net.fabricmc.loom.extension.MixinApExtension; +import net.fabricmc.loom.extension.MixinExtension; import net.fabricmc.loom.util.Constants; public final class CompileConfiguration { @@ -137,14 +137,20 @@ public final class CompileConfiguration { extension.getUnmappedModCollection().from(jarTask); } + MixinExtension mixin = LoomGradleExtension.get(project).getMixin(); + + if (!mixin.getUseLegacyMixinAp().get()) { + return; + } + + mixin.init(); + // Disable some things used by log4j via the mixin AP that prevent it from being garbage collected System.setProperty("log4j2.disable.jmx", "true"); System.setProperty("log4j.shutdownHookEnabled", "false"); System.setProperty("log4j.skipJansi", "true"); project.getLogger().info("Configuring compiler arguments for Java"); - MixinApExtension mixinApExtension = LoomGradleExtension.get(project).getMixin(); - mixinApExtension.init(); new JavaApInvoker(project).configureMixin(); -- cgit