Allow mixin configs to search for source from itself

- Helps raw addConfiguration calls to still have a config source

Author: Rongmario

build.gradle

@@ -51,8 +51,14 @@ sourceSets {
         ext.languageVersion = 8
         ext.compatibility = '1.8'
     }
+    cleanroom {
+        compileClasspath += main.output
+        ext.languageVersion = 8
+        ext.compatibility = '1.8'
+    }
     main {
         compileClasspath += legacy.output
+        compileClasspath += cleanroom.output
         ext.languageVersion = 8
         ext.compatibility = '1.8'
     }
@@ -80,11 +86,6 @@ sourceSets {
     test {
         ext.modularityExcluded = true
     }
-    cleanroom {
-        compileClasspath += main.output
-        ext.languageVersion = 8
-        ext.compatibility = '1.8'
-    }
     launchwrapper {
         compileClasspath += main.output
         ext.languageVersion = 8

…ervice/cleanroom/ModContainerHandle.java …tform/container/ContainerHandlePath.javasrc/cleanroom/java/org/spongepowered/asm/service/cleanroom/ModContainerHandle.java renamed to src/cleanroom/java/org/spongepowered/asm/launch/platform/container/ContainerHandlePath.java src/cleanroom/java/org/spongepowered/asm/service/cleanroom/ModContainerHandle.java renamed to src/cleanroom/java/org/spongepowered/asm/launch/platform/container/ContainerHandlePath.java

@@ -22,50 +22,37 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.asm.service.cleanroom;
+package org.spongepowered.asm.launch.platform.container;
 
-import org.spongepowered.asm.launch.platform.container.ContainerHandleURI;
+import java.nio.file.Path;
 
-import java.io.File;
-import java.net.URI;
-import java.nio.file.Paths;
-
-public class ModContainerHandle extends ContainerHandleURI {
-
-    private final String id;
-
-    public ModContainerHandle(URI uri, String id) {
-        super(uri);
-        if (id == null) {
-            String fileName = Paths.get(uri).getFileName().toString();
-            fileName = fileName.indexOf('.') != -1 ? fileName.substring(0, fileName.lastIndexOf('.')) : fileName;
-            this.id = fileName;
-        } else {
-            this.id = id;
-        }
-    }
-
-    public ModContainerHandle(File file, String id) {
-        this(file.toURI(), id);
-    }
+/**
+ * A nicer wrapper for {@link ContainerHandleURI} with NIO Paths
+ * Provides a {@link IContainerHandle#getId()} result based on the file name
+ */
+public class ContainerHandlePath extends ContainerHandleURI {
 
-    public ModContainerHandle(URI uri) {
-        this(uri, null);
-    }
+    /**
+     * Target Path
+     */
+    private final Path path;
 
-    public ModContainerHandle(File file) {
-        this(file.toURI(), null);
+    public ContainerHandlePath(Path path) {
+        super(path.getFileName().toString(), path.toUri());
+        this.path = path;
     }
 
     @Override
-    public String getId() {
-        return id;
+    public String getDescription() {
+        return this.path.toString();
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
     @Override
     public String toString() {
-        return String.format("ModContainerHandle(%s|%s)", this.getId(), this.getURI());
+        return String.format("ContainerHandlePath(%s|%s)", this.getId(), this.path);
     }
 
 }
-

src/cleanroom/java/org/spongepowered/asm/service/cleanroom/ICleanroomMixinService.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Mixin, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * 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.service.cleanroom;
+
+import java.net.URL;
+
+/**
+ * Cleanroom extension methods for IMixinService instances
+ */
+public interface ICleanroomMixinService {
+
+    /**
+     * Get a resource from the appropriate classloader, this is
+     * delegated via the service so that the service can choose the correct
+     * classloader from which to obtain the resource.
+     *
+     * @param name resource path
+     * @return resource or null if resource not found
+     */
+    public abstract URL getResource(String name);
+
+}

src/main/java/org/spongepowered/asm/launch/platform/container/ContainerHandleURI.java

@@ -37,7 +37,11 @@
  * from previous mixin versions
  */
 public class ContainerHandleURI implements IContainerHandle {
-    
+
+    /**
+     * String id
+     */
+    private final String id;
     /**
      * Target URI
      */
@@ -49,14 +53,19 @@ public class ContainerHandleURI implements IContainerHandle {
     private final MainAttributes attributes;
 
     public ContainerHandleURI(URI uri) {
+        this(null, uri);
+    }
+
+    // Added by Cleanroom
+    public ContainerHandleURI(String id, URI uri) {
+        this.id = id;
         this.uri = uri;
         this.attributes = MainAttributes.of(uri);
     }
 
     @Override
     public String getId() {
-        // Not enough information for this
-        return null;
+        return id;
     }
 
     @Override

src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java

@@ -24,14 +24,20 @@
  */
 package org.spongepowered.asm.mixin.transformer;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.google.common.base.Joiner;
+import org.spongepowered.asm.launch.platform.container.ContainerHandlePath;
 import org.spongepowered.asm.logging.Level;
 import org.spongepowered.asm.logging.ILogger;
 import org.spongepowered.asm.launch.MixinInitialisationError;
@@ -59,6 +65,7 @@
 import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException;
 import org.spongepowered.asm.service.IMixinService;
 import org.spongepowered.asm.service.MixinService;
+import org.spongepowered.asm.service.cleanroom.ICleanroomMixinService;
 import org.spongepowered.asm.util.VersionNumber;
 
 import com.google.common.base.Strings;
@@ -457,7 +464,7 @@ private MixinConfig() {}
     private boolean onLoad(IMixinService service, String name, MixinEnvironment fallbackEnvironment, IMixinConfigSource source) {
         this.service = service;
         this.name = name;
-        this.source = source;
+        this.source = findSource(source, name); // Added by Cleanroom
 
         // If parent is specified, don't perform postinit until parent is assigned
         if (!Strings.isNullOrEmpty(this.parentName)) {
@@ -1416,6 +1423,28 @@ static Config create(String configFile, MixinEnvironment outer, IMixinConfigSour
         }
     }
 
+    // Added by Cleanroom
+    private static IMixinConfigSource findSource(IMixinConfigSource original, String configFile) {
+        IMixinService service = MixinService.getService();
+        if (original == null || service instanceof ICleanroomMixinService) {
+            try {
+                URL resource = ((ICleanroomMixinService) service).getResource(configFile);
+                if (resource == null) {
+                    throw new IOException("Mixin config cannot be found, getResource and getResourceAsStream implementations are possibly inconsistent");
+                }
+                if (!"jar".equals(resource.getProtocol())) {
+                    throw new IOException("Mixin config does not reside in a jar file");
+                }
+                JarURLConnection conn = (JarURLConnection) resource.openConnection();
+                return new ContainerHandlePath(Paths.get(conn.getJarFileURL().toURI()));
+            } catch (IOException | URISyntaxException e) {
+                service.getLogger("mixin").warn("Unable to locate resource for mixin config source: {}", configFile, e);
+                return null;
+            }
+        }
+        return original;
+    }
+
     private static int getCollectionSize(Collection<?>... collections) {
         int total = 0;
         for (Collection<?> collection : collections) {