Allowing injecting in constructor

build.gradle

@@ -21,13 +21,12 @@ defaultTasks 'build'
 // Basic project information
 group = 'net.fabricmc'
 archivesBaseName = 'sponge-mixin'
-version = buildVersion
+version = buildVersion + "+fabric." + fabricBuildVersion
 
-ext.buildNumber = '0'
 
 def ENV = System.getenv()
 if (ENV.BUILD_NUMBER) {
-    version = version + "+build." + "${ENV.BUILD_NUMBER}"
+    version = version + "-build." + "${ENV.BUILD_NUMBER}"
     ext.buildNumber = "${ENV.BUILD_NUMBER}"
 } else {
     version = version + "+local"
@@ -158,6 +157,9 @@ dependencies {
     modlauncherCompile ('cpw.mods:modlauncher:4.2.0') {
         exclude module: 'log4j-core'
     }
+    // Fabric: only exists in runtime elements in gradle module metadata of modlauncher,
+    // need to declare to compile against explicitly
+    modlauncherImplementation 'cpw.mods:grossjava9hacks:1.3.+'
 
     // agent
     agentCompile configurations.compile

gradle.properties

@@ -9,3 +9,4 @@ buildType=RELEASE
 asmVersion=7.2
 legacyForgeAsmVersion=5.0.3
 modlauncherAsmVersion=6.2
+fabricBuildVersion=1

src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java

@@ -289,6 +289,19 @@ public boolean checkPriority(int targetPriority, int mixinPriority) {
      * @return restriction level
      */
     public RestrictTargetLevel getTargetRestriction(IInjectionPointContext context) {
+        return RestrictTargetLevel.CONSTRUCTORS_AFTER_DELEGATE; // Fabric change: allow inject in constructors
+    }
+
+    /**
+     * Returns the target restriction level for this injection point's cancellation for
+     * {@literal @Inject} annotations. This level defines whether an injection point
+     * can declare {@code cancellable = true}.
+     *
+     * @param context injection-specific context
+     * @return restriction level
+     */
+    // Fabric addition: prevent cancellation of inject in constructors
+    public RestrictTargetLevel getCancellationRestriction(IInjectionPointContext context) {
         return RestrictTargetLevel.METHODS_ONLY;
     }
 

src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java

@@ -397,6 +397,16 @@ protected void addTargetNode(Target target, List<InjectionNode> myNodes, Abstrac
                 throw new InvalidInjectionException(this.info, String.format("%s selector %s", ip, ex.getMessage()));
             }
 
+            // Fabric start: prevent cancellation in constructor injections
+            if (this.cancellable) {
+                try {
+                    this.checkTargetForNode(target, injectionNode, ip.getCancellationRestriction(this.info));
+                } catch (InvalidInjectionException ex) {
+                    throw new InvalidInjectionException(this.info, String.format("%s selector (cancellable = true) %s", ip, ex.getMessage()));
+                }
+            }
+            // Fabric end
+
             String id = ip.getId();
             if (Strings.isNullOrEmpty(id)) {
                 continue;