diff --git a/build.gradle b/build.gradle index 5d1ee59741..a49df84377 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ plugins { id 'net.minecraftforge.gradleutils' version '[2.6.4,2.7)' id 'eclipse' id 'de.undercouch.download' version '5.4.0' - id 'net.minecraftforge.gradle.patcher' version '[6.0.22,6.2)' apply false - id 'net.minecraftforge.gradle.mcp' version '[6.0.22,6.2)' apply false + id 'net.minecraftforge.gradle.patcher' version '[6.0.46,6.2)' apply false + id 'net.minecraftforge.gradle.mcp' version '[6.0.46,6.2)' apply false id 'net.minecraftforge.gradlejarsigner' version '1.0.4' id 'org.barfuin.gradle.taskinfo' version '2.1.0' } diff --git a/build_forge.gradle b/build_forge.gradle index e2d2b587c7..268facc2f3 100644 --- a/build_forge.gradle +++ b/build_forge.gradle @@ -135,6 +135,7 @@ dependencies { installer(libs.maven.artifact) installer(libs.bundles.terminalconsoleappender) installer(libs.mixin) + installer(libs.mixinextras.forge) installer(libs.bundles.jarjar) installer(libs.roimfs) @@ -301,6 +302,11 @@ tasks.userdevConfig.configure { libraries.add(dep) } + // TODO [ForgeDev][UserDev] Split API/Runtime elements in userdev config + // so we don't gotta keep making exceptions for MixinExtras + addCompileDependency(libs.mixinextras.common) + addAnnotationProcessorDependency(libs.mixinextras.common) + inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround... runs { client { diff --git a/fmlloader/build.gradle b/fmlloader/build.gradle index f122226cec..70cae8a9d0 100644 --- a/fmlloader/build.gradle +++ b/fmlloader/build.gradle @@ -108,6 +108,15 @@ tasks.register('jarJarOptionsJson', net.minecraftforge.forge.tasks.JarJarMetadat metadataFile = project.file('src/main/resources/jarjar_options.json') // This is resolved too early by cpw.mods.modlauncher.TransformationServicesHandler.discoverServices(DiscoveryData) But eventually... //add(libs.mixin, 'org/spongepowered/asm/mixin/Mixin.class') + add(libs.mixinextras.forge) { + containedJarMetadata { + path = '' + } + resource = 'com/llamalad7/mixinextras/platform/forge/MixinExtrasConfigPlugin.class' + layer = 'GAMELIBRARY' + id = 'mixinextras' + nested = true + } } tasks.named('generateResources').configure { diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java index d0a20f6c05..da0d2549f8 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java @@ -7,8 +7,10 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; import cpw.mods.jarhandling.SecureJar; +import cpw.mods.modlauncher.Launcher; import cpw.mods.modlauncher.api.LamdbaExceptionUtils; import cpw.mods.modlauncher.api.NamedPath; +import cpw.mods.modlauncher.api.TypesafeMap; import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService; import org.jetbrains.annotations.ApiStatus; @@ -40,6 +42,17 @@ public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService @Override public void earlyInitialization(final String launchTarget, final String[] arguments) { + boolean isMixinEnabledInDev = false; + for (String arg : arguments) { + if (arg.startsWith("-mixin.config")) { + isMixinEnabledInDev = true; + break; + } + } + Launcher.INSTANCE.blackboard().putIfAbsent( + TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "isMixinEnabledInDev", Boolean.class), + isMixinEnabledInDev + ); ImmediateWindowHandler.load(launchTarget, arguments); } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java index 2c7b6ff29c..c2e497621e 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java @@ -9,16 +9,23 @@ import com.electronwill.nightconfig.core.UnmodifiableConfig; import com.electronwill.nightconfig.core.file.FileConfig; import com.mojang.logging.LogUtils; +import cpw.mods.modlauncher.Launcher; +import cpw.mods.modlauncher.api.TypesafeMap; import net.minecraftforge.fml.loading.EarlyLoadingException; import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData; +import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.locating.IDependencyLocator; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile.Type; +import net.minecraftforge.jarjar.metadata.ContainedJarIdentifier; import net.minecraftforge.jarjar.metadata.ContainedJarMetadata; +import net.minecraftforge.jarjar.metadata.ContainedVersion; import net.minecraftforge.jarjar.metadata.MetadataIOHandler; import net.minecraftforge.jarjar.selection.JarSelector; +import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; +import org.apache.maven.artifact.versioning.VersionRange; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -44,6 +51,7 @@ import java.util.List; import java.util.Map; import java.util.StringJoiner; import java.util.TreeMap; +import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.stream.Collectors; @@ -63,6 +71,25 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID private static final Map OPTIONS = new HashMap<>(); private static volatile boolean optionsLoaded = false; + private static final Attributes.Name MIXIN_CONFIGS_ATTR = new Attributes.Name("MixinConfigs"); + private static final Attributes.Name MIXIN_CONNECTOR_ATTR = new Attributes.Name("MixinConnector"); + private static final ContainedJarMetadata MIXIN_EXTRAS_DEPENDENCY = makeMixinExtraDependency(); + + private static ContainedJarMetadata makeMixinExtraDependency() { + VersionRange range = null; + try { + range = VersionRange.createFromVersionSpec("[0,)"); + } catch (InvalidVersionSpecificationException e) { + throw new RuntimeException("Failed to create version range for mixinextras-forge dependency", e); + } + + return new ContainedJarMetadata( + new ContainedJarIdentifier("io.github.llamalad7", "mixinextras-forge"), + new ContainedVersion(range, null), + null, false + ); + } + @Override public String name() { return "JarInJar"; @@ -80,7 +107,11 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID var selector = new Selector(mods); - if (selector.entries.size() == mods.size()) { + // Add a synthetic Mixin-Extras dependency if we detect anyone using Mixin + if (anyMixinsLoaded(mods)) { + if (!selector.isRequired(MIXIN_EXTRAS_DEPENDENCY.identifier())) + selector.addRequirement(MIXIN_EXTRAS_DEPENDENCY); + } else if (selector.entries.size() == mods.size()) { LOGGER.info("No dependencies to load found. Skipping!"); return Collections.emptyList(); } @@ -189,6 +220,29 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID return ret; } + private static Boolean anyMixinsLoaded = null; + private static boolean anyMixinsLoaded(List mods) { + var ret = anyMixinsLoaded; + if (ret != null) return ret; + + if (!FMLEnvironment.production + && Launcher.INSTANCE.blackboard().get(TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "isMixinEnabledInDev", Boolean.class)).orElse(false)) { + anyMixinsLoaded = true; + return true; + } + + for (var mod : mods) { + var attributes = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes(); + if (attributes.getValue(MIXIN_CONFIGS_ATTR) != null || attributes.getValue(MIXIN_CONNECTOR_ATTR) != null) { + anyMixinsLoaded = true; + return true; + } + } + + anyMixinsLoaded = false; + return false; + } + private record Options(List options) {} private record OptionMetadata(String resource, Type layer, String id, List deps, ContainedJarMetadata meta, boolean nested) {} diff --git a/fmlloader/src/main/resources/jarjar_options.json b/fmlloader/src/main/resources/jarjar_options.json index 7555049644..e155268e8b 100644 --- a/fmlloader/src/main/resources/jarjar_options.json +++ b/fmlloader/src/main/resources/jarjar_options.json @@ -1,3 +1,35 @@ { - "options": [] + "options": [ + { + "resource": "com/llamalad7/mixinextras/platform/forge/MixinExtrasConfigPlugin.class", + "layer": "GAMELIBRARY", + "id": "mixinextras", + "deps": [ + { + "identifier": { + "group": "com.github.LlamaLad7", + "artifact": "MixinExtras" + }, + "version": { + "range": "[0.5.0,)", + "artifactVersion": "0.5.0" + }, + "path": "", + "isObfuscated": false + } + ], + "meta": { + "identifier": { + "group": "io.github.llamalad7", + "artifact": "mixinextras-forge" + }, + "version": { + "artifactVersion": "0.5.0" + }, + "path": "", + "isObfuscated": false + }, + "nested": true + } + ] } \ No newline at end of file diff --git a/mdk/build.gradle b/mdk/build.gradle index 96d7252dca..1c06cc2179 100644 --- a/mdk/build.gradle +++ b/mdk/build.gradle @@ -2,7 +2,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '[6.0.36,6.2)' + id 'net.minecraftforge.gradle' version '[6.0.46,6.2)' } version = mod_version diff --git a/settings.gradle b/settings.gradle index 1dbb4fa743..61fbb746c3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,6 +38,9 @@ dependencyResolutionManagement { library('roimfs', 'net.minecraftforge:roimfs:1.0.0') // ReadOnlyInMemoryFileSystem - Used for JarInJar extraction at runtime library('mixin', 'org.spongepowered:mixin:0.8.7') + version('mixinextras', '0.5.0') + library('mixinextras-forge', 'io.github.llamalad7', 'mixinextras-forge').versionRef('mixinextras') + library('mixinextras-common', 'io.github.llamalad7', 'mixinextras-common').versionRef('mixinextras') library('jetbrains-annotations', 'org.jetbrains:annotations:24.1.0') // for ApiStatus annotations library('jspecify', 'org.jspecify:jspecify:1.0.0') // for nullability annotations library('slf4j-api', 'org.slf4j:slf4j-api:2.0.7')