diff --git a/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java b/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java index b126e56a..ca195b70 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java +++ b/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java @@ -139,16 +139,23 @@ public class MixinPlatformAgentFMLLegacy extends MixinPlatformAgentAbstract impl private boolean initInjectionState; @Override - public boolean accept(MixinPlatformManager manager, IContainerHandle handle) { - if (!(handle instanceof ContainerHandleURI) || !super.accept(manager, handle)) { - return false; + public AcceptResult accept(MixinPlatformManager manager, IContainerHandle handle) { + try { + this.clCoreModManager = MixinPlatformAgentFMLLegacy.getCoreModManagerClass(); + } catch (ClassNotFoundException ex) { + MixinPlatformAgentAbstract.logger.info("FML platform manager could not load class {}. Proceeding without FML support.", + ex.getMessage()); + return AcceptResult.INVALID; } + if (!(handle instanceof ContainerHandleURI) || super.accept(manager, handle) != AcceptResult.ACCEPTED) { + return AcceptResult.REJECTED; + } + this.file = ((ContainerHandleURI)handle).getFile(); this.fileName = this.file.getName(); this.coreModWrapper = this.initFMLCoreMod(); - - return true; + return this.coreModWrapper != null ? AcceptResult.ACCEPTED : AcceptResult.REJECTED; } /** @@ -156,14 +163,6 @@ public class MixinPlatformAgentFMLLegacy extends MixinPlatformAgentAbstract impl */ private ITweaker initFMLCoreMod() { try { - try { - this.clCoreModManager = MixinPlatformAgentFMLLegacy.getCoreModManagerClass(); - } catch (ClassNotFoundException ex) { - MixinPlatformAgentAbstract.logger.info("FML platform manager could not load class {}. Proceeding without FML support.", - ex.getMessage()); - return null; - } - if ("true".equalsIgnoreCase(this.handle.getAttribute(MixinPlatformAgentFMLLegacy.MFATT_FORCELOADASMOD))) { MixinPlatformAgentAbstract.logger.debug("ForceLoadAsMod was specified for {}, attempting force-load", this.fileName); this.loadAsMod(); @@ -424,7 +423,11 @@ public class MixinPlatformAgentFMLLegacy extends MixinPlatformAgentAbstract impl public String getSideName() { // Using this method first prevents us from accidentally loading FML // classes too early when using the tweaker in dev - for (ITweaker tweaker : GlobalProperties.>get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKS)) { + List tweakerList = GlobalProperties.>get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKS); + if (tweakerList == null) { + return null; + } + for (ITweaker tweaker : tweakerList) { if (tweaker.getClass().getName().endsWith(MixinPlatformAgentFMLLegacy.SERVER_TWEAKER_TAIL)) { return Constants.SIDE_SERVER; } else if (tweaker.getClass().getName().endsWith(MixinPlatformAgentFMLLegacy.CLIENT_TWEAKER_TAIL)) { diff --git a/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentLiteLoaderLegacy.java b/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentLiteLoaderLegacy.java index 0aa026c8..01cbe9fc 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentLiteLoaderLegacy.java +++ b/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentLiteLoaderLegacy.java @@ -39,8 +39,8 @@ public class MixinPlatformAgentLiteLoaderLegacy extends MixinPlatformAgentAbstra private static final String LITELOADER_TWEAKER_NAME = "com.mumfrey.liteloader.launch.LiteLoaderTweaker"; @Override - public boolean accept(MixinPlatformManager manager, IContainerHandle handle) { - return false; + public AcceptResult accept(MixinPlatformManager manager, IContainerHandle handle) { + return AcceptResult.REJECTED; } /* (non-Javadoc) diff --git a/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java b/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java index 6f9487ae..46dd8804 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java @@ -38,6 +38,29 @@ import org.spongepowered.asm.launch.platform.container.IContainerHandle; */ public interface IMixinPlatformAgent { + /** + * Result type returned from {@link IMixinPlatformAgent#accept} + */ + public enum AcceptResult { + + /** + * The container was accepted + */ + ACCEPTED, + + /** + * The container was rejected + */ + REJECTED, + + /** + * The agent encountered an error and no further containers should be + * offered + */ + INVALID; + + } + /** * Accept and bind to a container handle. This method is called for agents * hosted by {@link MixinContainer} and the agent should react accordingly. @@ -47,11 +70,10 @@ public interface IMixinPlatformAgent { * * @param manager platform manager instance * @param handle handle to container - * @return true if this agent can accept a container of the supplied type, - * false if the agent cannot handle the container (in which case it - * will be discarded) + * @return AcceptResult representing this agent's acceptance of the supplied + * container */ - public abstract boolean accept(MixinPlatformManager manager, IContainerHandle handle); + public abstract AcceptResult accept(MixinPlatformManager manager, IContainerHandle handle); /** * Get the phase provider for this agent diff --git a/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformServiceAgent.java b/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformServiceAgent.java index 495279ac..3f9d69cf 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformServiceAgent.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformServiceAgent.java @@ -28,6 +28,7 @@ import java.util.Collection; import org.spongepowered.asm.launch.platform.container.IContainerHandle; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import org.spongepowered.asm.util.Constants; import org.spongepowered.asm.util.IConsumer; /** @@ -43,7 +44,10 @@ public interface IMixinPlatformServiceAgent extends IMixinPlatformAgent { public abstract void init(); /** - * Attempt to determine the side name from the current environment + * Attempt to determine the side name from the current environment. Return + * null if the side name cannot be determined by this agent. Return + * side name or {@link Constants#SIDE_UNKNOWN} if the agent is able to + * determine the side. */ public abstract String getSideName(); diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java index 4723ca00..4e6491ad 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java @@ -26,11 +26,13 @@ package org.spongepowered.asm.launch.platform; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.launch.GlobalProperties; +import org.spongepowered.asm.launch.platform.IMixinPlatformAgent.AcceptResult; import org.spongepowered.asm.launch.platform.container.IContainerHandle; import org.spongepowered.asm.service.MixinService; @@ -59,22 +61,25 @@ public class MixinContainer { public MixinContainer(MixinPlatformManager manager, IContainerHandle handle) { this.handle = handle; - for (String agentClass : MixinContainer.agentClasses) { + for (Iterator iter = MixinContainer.agentClasses.iterator(); iter.hasNext();) { + String agentClass = iter.next(); try { @SuppressWarnings("unchecked") Class clazz = (Class)Class.forName(agentClass); String simpleName = clazz.getSimpleName(); - String acceptAction = "rejected"; MixinContainer.logger.debug("Instancing new {} for {}", simpleName, this.handle); IMixinPlatformAgent agent = clazz.newInstance(); - if (agent.accept(manager, this.handle)) { + AcceptResult acceptAction = agent.accept(manager, this.handle); + if (acceptAction == AcceptResult.ACCEPTED) { this.agents.add(agent); - acceptAction = "accepted"; + } else if (acceptAction == AcceptResult.INVALID) { + iter.remove(); + continue; } - MixinContainer.logger.debug("{} {} container {}", simpleName, acceptAction, this.handle); + MixinContainer.logger.debug("{} {} container {}", simpleName, acceptAction.name().toLowerCase(), this.handle); } catch (InstantiationException ex) { Throwable cause = ex.getCause(); if (cause instanceof RuntimeException) { diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java index 79637f51..af49997b 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java @@ -56,10 +56,10 @@ public abstract class MixinPlatformAgentAbstract implements IMixinPlatformAgent } @Override - public boolean accept(MixinPlatformManager manager, IContainerHandle handle) { + public AcceptResult accept(MixinPlatformManager manager, IContainerHandle handle) { this.manager = manager; this.handle = handle; - return true; + return AcceptResult.ACCEPTED; } @Override diff --git a/src/modlauncher/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentMinecraftForge.java b/src/modlauncher/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentMinecraftForge.java index 82fc449a..700897d5 100644 --- a/src/modlauncher/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentMinecraftForge.java +++ b/src/modlauncher/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentMinecraftForge.java @@ -53,9 +53,9 @@ public class MixinPlatformAgentMinecraftForge extends MixinPlatformAgentAbstract * org.spongepowered.asm.launch.platform.container.IContainerHandle) */ @Override - public boolean accept(MixinPlatformManager manager, IContainerHandle handle) { + public AcceptResult accept(MixinPlatformManager manager, IContainerHandle handle) { // No containers plz - return false; + return AcceptResult.REJECTED; } /* (non-Javadoc) diff --git a/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/MixinServiceModLauncher.java b/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/MixinServiceModLauncher.java index c7782f6e..55eb7ed1 100644 --- a/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/MixinServiceModLauncher.java +++ b/src/modlauncher/java/org/spongepowered/asm/service/modlauncher/MixinServiceModLauncher.java @@ -225,7 +225,8 @@ public class MixinServiceModLauncher extends MixinServiceAbstract { @Override public Collection getPlatformAgents() { return ImmutableList.of( - "org.spongepowered.asm.launch.platform.MixinPlatformAgentMinecraftForge" + "org.spongepowered.asm.launch.platform.MixinPlatformAgentMinecraftForge", + "org.spongepowered.asm.launch.platform.MixinPlatformAgentFMLLegacy" ); }