Update to mixin 0.5.6

Mumfrey
1 parent 7d6e88cd
Showing 4 changed files with 13 additions and 6 deletions
build.gradle
src/main/java/com/mumfrey/liteloader/api/MixinConfigProvider.java
src/main/java/com/mumfrey/liteloader/api/manager/APIProviderBasic.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
@@ -72,7 +72,7 @@ repositories {
 dependencies {
 //    compile 'org.ow2.asm:asm-debug-all:5.0.3'
-    compile('org.spongepowered:mixin:0.5.5-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.5.6-SNAPSHOT') {
         exclude module: 'asm-commons'
         exclude module: 'asm-tree'
         exclude module: 'launchwrapper'
@@ -270,8 +270,8 @@ artifacts {
 task deploy(type: Copy, dependsOn: build) {
     def libraryDir = new File(new File(System.env.APPDATA), ".minecraft/libraries")
     from shadowJar.outputs.files[0]
-    into new File(libraryDir, sprintf('%1$s%4$s%2$s%4$s%3$s', project.group.replace('.', File.separator), archivesBaseName, buildVersion, File.separatorChar)) 
-    rename shadowJar.outputs.files[0].name, sprintf("%s-%s.jar", archivesBaseName, buildVersion)
+    into new File(libraryDir, sprintf('%1$s%4$s%2$s%4$s%3$s', project.group.replace('.', File.separator), archivesBaseName, version, File.separatorChar)) 
+    rename shadowJar.outputs.files[0].name, sprintf("%s-%s.jar", archivesBaseName, version)
 }
 uploadArchives { 
@@ -15,7 +15,10 @@ public interface MixinConfigProvider
     /**
      * Get the minimum required mixin operating compatibility level for this
      * API, can return null.
+     * 
+     * @deprecated Specify level in configs
      */
+    @Deprecated
     public abstract CompatibilityLevel getCompatibilityLevel();
     /**
@@ -15,6 +15,7 @@ import java.util.regex.Matcher;
 import org.spongepowered.asm.mixin.MixinEnvironment;
 import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel;
+import org.spongepowered.asm.mixin.Mixins;
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.api.LiteAPI;
@@ -86,7 +87,7 @@ class APIProviderBasic implements APIProvider, APIAdapter
                 {
                     for (String config : configs)
                     {
-                        MixinEnvironment.getDefaultEnvironment().addConfiguration(config);
+                        Mixins.addConfiguration(config);
                     }
                 }
@@ -95,7 +96,7 @@ class APIProviderBasic implements APIProvider, APIAdapter
                 {
                     for (String handlerName : errorHandlers)
                     {
-                        MixinEnvironment.getDefaultEnvironment().registerErrorHandlerClass(handlerName);
+                        Mixins.registerErrorHandlerClass(handlerName);
                     }
                 }
             }
@@ -22,6 +22,7 @@ import java.util.Set;
 import org.spongepowered.asm.mixin.MixinEnvironment;
 import org.spongepowered.asm.mixin.MixinEnvironment.Phase;
+import org.spongepowered.asm.mixin.Mixins;
 import com.google.common.base.Throwables;
 import com.mumfrey.liteloader.LiteMod;
@@ -644,7 +645,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
                 if (config.endsWith(".json"))
                 {
                     LiteLoaderLogger.info(Verbosity.REDUCED, "Registering mixin config %s for %s", config, container.getName());
-                    MixinEnvironment.getDefaultEnvironment().addConfiguration(config);
+                    Mixins.addConfiguration(config);
                     this.injectContainerRecursive(container);
                 }
                 else if (config.contains(".json@"))
@@ -656,6 +657,8 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
                     if (phase != null)
                     {
                         LiteLoaderLogger.info(Verbosity.REDUCED, "Registering mixin config %s for %s", config, container.getName());
+                        LiteLoaderLogger.warning("%s specifies mixin environment in metadata which is deprecated, use config instead",
+                                container.getName());
                         MixinEnvironment.getEnvironment(phase).addConfiguration(config);
                         this.injectContainerRecursive(container);
                     }