Update for ModLauncher 4.0, remove ugly hax, connectors now via manifest

This commit is contained in:
Mumfrey committed 2019-09-29 21:34:42 +01:00
1 parent a15897221b
commit 57d5655f73
21 files changed
+413 -732

No files matched your search

@@ -82,11 +82,6 @@ public abstract class MixinBootstrap {
* Platform manager instance
*/
private static MixinPlatformManager platform;
/**
* Connectors
*/
private static MixinConnectorManager connectors = new MixinConnectorManager();
private MixinBootstrap() {}
@@ -193,7 +188,6 @@ public abstract class MixinBootstrap {
static void inject() {
MixinBootstrap.getPlatform().inject();
MixinBootstrap.connectors.inject();
}
private static boolean isSubsystemRegistered() {
@@ -22,17 +22,21 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package org.spongepowered.asm.launch;
package org.spongepowered.asm.launch.platform;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader;
import java.util.Set;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.connect.IMixinConnector;
import org.spongepowered.asm.service.IClassProvider;
import org.spongepowered.asm.service.MixinService;
/**
* Manager for Mixin containers bootstrapping via {@link IMixinConnector}
@@ -43,27 +47,50 @@ public class MixinConnectorManager {
* Logging to the max
*/
private static final Logger logger = LogManager.getLogger("mixin");
private final Set<String> connectorClasses = new LinkedHashSet<String>();
private List<IMixinConnector> connectors = new ArrayList<IMixinConnector>();
private final List<IMixinConnector> connectors = new ArrayList<IMixinConnector>();
MixinConnectorManager() {
}
void addConnector(String connectorClass) {
this.connectorClasses.add(connectorClass);
}
void inject() {
this.loadConnectors();
this.initConnectors();
}
@SuppressWarnings("unchecked")
void loadConnectors() {
ServiceLoader<IMixinConnector> serviceLoader = ServiceLoader.load(IMixinConnector.class);
for (Iterator<IMixinConnector> iterator = serviceLoader.iterator(); iterator.hasNext(); ) {
IClassProvider classProvider = MixinService.getService().getClassProvider();
for (String connectorClassName : this.connectorClasses) {
Class<IMixinConnector> connectorClass = null;
try {
IMixinConnector connector = iterator.next();
Class<?> clazz = classProvider.findClass(connectorClassName);
if (!IMixinConnector.class.isAssignableFrom(clazz)) {
MixinConnectorManager.logger.error("Mixin Connector [" + connectorClassName + "] does not implement IMixinConnector");
continue;
}
connectorClass = (Class<IMixinConnector>)clazz;
} catch (ClassNotFoundException ex) {
MixinConnectorManager.logger.catching(ex);
continue;
}
try {
IMixinConnector connector = connectorClass.newInstance();
this.connectors.add(connector);
} catch (ServiceConfigurationError e) {
MixinConnectorManager.logger.catching(e);
MixinConnectorManager.logger.info("Successfully loaded Mixin Connector [" + connectorClassName + "]");
} catch (ReflectiveOperationException ex) {
MixinConnectorManager.logger.warn("Error loading Mixin Connector [" + connectorClassName + "]", ex);
}
}
this.connectorClasses.clear();
}
void initConnectors() {
@@ -53,6 +53,11 @@ public class MixinPlatformAgentDefault extends MixinPlatformAgentAbstract {
this.manager.addTokenProvider(provider.trim());
}
}
String connectorClass = this.handle.getAttribute(ManifestAttributes.MIXINCONNECTOR);
if (connectorClass != null) {
this.manager.addConnector(connectorClass.trim());
}
}
}
@@ -68,6 +68,12 @@ public class MixinPlatformManager {
*/
private final Map<IContainerHandle, MixinContainer> containers = new LinkedHashMap<IContainerHandle, MixinContainer>();
/**
* Connectors
*/
private final MixinConnectorManager connectors = new MixinConnectorManager();
/**
* Container for this tweaker
*/
@@ -187,6 +193,8 @@ public class MixinPlatformManager {
ex.printStackTrace();
}
}
this.connectors.inject();
}
/**
@@ -280,5 +288,16 @@ public class MixinPlatformManager {
MixinEnvironment.getDefaultEnvironment().registerTokenProviderClass(provider);
}
/**
* Add a mixin connector class for a jar manifest source. Supports only bare
* class names.
*
* @param connectorClass Name of the connector class to load
*/
final void addConnector(String connectorClass) {
this.connectors.addConnector(connectorClass);
}
}
@@ -69,6 +69,7 @@ public abstract class Constants {
public static final String MAINCLASS = "Main-Class";
public static final String MIXINCONFIGS = "MixinConfigs";
public static final String TOKENPROVIDERS = "MixinTokenProviders";
public static final String MIXINCONNECTOR = "MixinConnector";
@Deprecated
public static final String COMPATIBILITY = "MixinCompatibilityLevel";