diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/IInjectionPointContext.java b/src/main/java/org/spongepowered/asm/mixin/injection/IInjectionPointContext.java new file mode 100644 index 00000000..7aca7718 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/IInjectionPointContext.java @@ -0,0 +1,52 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.refmap.IMixinContext; + +/** + * Context for an injection point, used to access the mixin as well as the owner + * method and annotation for the injection point + */ +public interface IInjectionPointContext { + + /** + * Get the mixin context for this injection + */ + public abstract IMixinContext getContext(); + + /** + * Get the injection handler method + */ + public abstract MethodNode getMethod(); + + /** + * Get the parent annotation (eg. the @Inject annotation) + */ + public abstract AnnotationNode getAnnotation(); + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/code/ISliceContext.java b/src/main/java/org/spongepowered/asm/mixin/injection/code/ISliceContext.java new file mode 100644 index 00000000..31d9642d --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/code/ISliceContext.java @@ -0,0 +1,34 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.code; + +import org.spongepowered.asm.mixin.injection.IInjectionPointContext; + +/** + * Context for a slice declaration + */ +public interface ISliceContext extends IInjectionPointContext { + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 1870ce2b..dff63342 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -49,6 +49,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.refmap.ReferenceMapper; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.VersionNumber; @@ -74,6 +75,9 @@ class MixinConfig implements Comparable, IMixinConfig { @SerializedName("defaultGroup") String defaultGroup = "default"; + @SerializedName("injectionPoints") + List injectionPoints; + } /** @@ -293,6 +297,7 @@ class MixinConfig implements Comparable, IMixinConfig { this.name = name; this.env = this.parseSelector(this.selector, fallbackEnvironment); this.initCompatibilityLevel(); + this.initInjectionPoints(); return this.checkVersion(); } @@ -346,6 +351,26 @@ class MixinConfig implements Comparable, IMixinConfig { } return fallbackEnvironment; } + + @SuppressWarnings("unchecked") + private void initInjectionPoints() { + if (this.injectorOptions.injectionPoints == null) { + return; + } + + for (String injectionPoint : this.injectorOptions.injectionPoints) { + try { + Class injectionPointClass = Class.forName(injectionPoint, true, Launch.classLoader); + if (InjectionPoint.class.isAssignableFrom(injectionPointClass)) { + InjectionPoint.register((Class)injectionPointClass); + } else { + this.logger.error("Unable to register injection point {} for {}, class must extend InjectionPoint", injectionPointClass, this); + } + } catch (Throwable th) { + this.logger.catching(th); + } + } + } private boolean checkVersion() throws MixinInitialisationError { VersionNumber minVersion = VersionNumber.parse(this.version);