Merge remote-tracking branch 'origin/pr/520'

Author: Mumfrey

build.gradle

@@ -44,6 +44,7 @@ ext.legacyForgeAsmVersion = project.hasProperty("legacyForgeAsmVersion") ? asmVe
 ext.doSignJar = project.hasProperty("keyStorePath")
 
 java {
+    modularity.inferModulePath = false
     toolchain.languageVersion = JavaLanguageVersion.of(ciSystem == 'unknown' ? 16 : 8)
 }
 
@@ -97,6 +98,7 @@ sourceSets {
         compileClasspath += main.output
         ext.languageVersion = 8
         ext.compatibility = '1.6'
+        ext.modularityExcluded = true
     }
     agent {
         compileClasspath += main.output
@@ -107,10 +109,15 @@ sourceSets {
         compileClasspath += main.output
         ext.languageVersion = 8
         ext.compatibility = '1.8'
+        ext.modularityExcluded = true
     }
     example {
         compileClasspath += main.output
         compileClasspath += ap.output
+        ext.modularityExcluded = true
+    }
+    test {
+        ext.modularityExcluded = true
     }
     launchwrapper {
         compileClasspath += main.output
@@ -135,14 +142,7 @@ sourceSets {
     }
     modularity {
         ext.languageVersion = 16
-        java.srcDirs += [
-            sourceSets.legacy.java.srcDirs,
-            sourceSets.main.java.srcDirs,
-            sourceSets.ap.java.srcDirs,
-            sourceSets.agent.java.srcDirs,
-            sourceSets.modlauncher.java.srcDirs,
-            sourceSets.modlauncher9.java.srcDirs
-        ]
+        ext.modularityExcluded = true // don't add ourselves
     }
 }
 
@@ -205,14 +205,6 @@ dependencies {
     modularityCompileOnly 'org.apache.logging.log4j:log4j-core:2.11.2'
 }
 
-compileModularityJava {
-    doFirst {
-        options.compilerArgs = [
-            '--module-path', classpath.asPath
-        ]
-    }
-}
-
 javadoc {
     exclude '**/throwables'
     classpath += sourceSets.legacy.output
@@ -285,7 +277,6 @@ checkstyle {
     ]
     configFile = file("checkstyle.xml")
     toolVersion = '8.43'
-    sourceSets -= project.sourceSets['modularity']
 }
 
 // Source compiler configuration
@@ -295,6 +286,8 @@ tasks.withType(JavaCompile) {
     options.encoding = 'utf8'
 }
 
+def modularityInputs = objects.fileCollection()
+
 project.sourceSets.each { set -> {
     if (set.ext.has("languageVersion")) {
         project.tasks[set.compileJavaTaskName].javaCompiler = javaToolchains.compilerFor {
@@ -305,8 +298,25 @@ project.sourceSets.each { set -> {
         project.tasks[set.compileJavaTaskName].sourceCompatibility = set.ext.compatibility
         project.tasks[set.compileJavaTaskName].targetCompatibility = set.ext.compatibility
     }
+    def modularityExcluded = set.ext.has("modularityExcluded") && set.ext.modularityExcluded
+    if (!modularityExcluded) {
+        project.sourceSets.modularity {
+            compileClasspath += set.output
+        }
+        modularityInputs.from set.output
+    }
 }}
 
+compileModularityJava {
+    inputs.files(modularityInputs)
+    doFirst {
+        options.compilerArgs = [
+            '--module-path', classpath.asPath,
+            '--patch-module', "org.spongepowered.mixin=${modularityInputs.collect { it.absolutePath }.join(File.pathSeparator)}"
+        ]
+    }
+}
+
 if (JavaVersion.current().isJava8Compatible()) {
     tasks.withType(Javadoc) {
         // disable the crazy super-strict doclint tool in Java 8
@@ -318,8 +328,6 @@ task stagingJar(type: ShadowJar) {
     sourceSets.findAll { !(it.name =~ /example|test/) }.each {
         from it.output
     }
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    
     configurations = [project.configurations.stagingJar]
 
     // JAR manifest configuration

checkstyle.xml

@@ -11,6 +11,9 @@
 <module name="Checker">
   <property name="severity" value="warning"/>
   <property name="charset" value="UTF-8"/>
+  <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="module\-info\.java$"/>
+  </module>
   <module name="TreeWalker">
     <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">

src/main/java/org/spongepowered/asm/util/PrettyPrinter.java

@@ -1147,7 +1147,7 @@ private void logSpecial(ILogger logger, Level level, ISpecialEntry line) {
 
     private void logString(ILogger logger, Level level, String line) {
         if (line != null) {
-            logger.log(level, "/* {} */", String.format("%-" + this.width, line));
+            logger.log(level, "/* {} */", String.format("%-" + this.width + "s", line));
         }
     }