Bump mixin version and fix some mixin conflicts with sponge

Mumfrey
1 parent 23f62bda
Showing 5 changed files with 7 additions and 4 deletions
.gitignore
build.gradle
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerInteractionManager.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerList.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderMods.java
@@ -75,4 +75,6 @@ nb-configuration.xml
 *.ipr
 *.iws
 *.launch
+.factorypath
+/.apt_generated/
@@ -72,7 +72,7 @@ repositories {
 }
 dependencies {
-    compile('org.spongepowered:mixin:0.6.4-SNAPSHOT') {
+    compile('org.spongepowered:mixin:0.6.6-SNAPSHOT') {
         exclude module: 'asm-commons'
         exclude module: 'asm-tree'
         exclude module: 'launchwrapper'
@@ -22,7 +22,7 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-@Mixin(PlayerInteractionManager.class)
+@Mixin(value = PlayerInteractionManager.class, priority = 2000)
 public abstract class MixinPlayerInteractionManager
 {
     @Inject(
@@ -20,7 +20,7 @@ import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.server.management.PlayerList;
-@Mixin(PlayerList.class)
+@Mixin(value = PlayerList.class, priority = 2000)
 public abstract class MixinPlayerList
 {
     @Inject(
@@ -296,7 +296,8 @@ public class LiteLoaderMods
      */
     public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws IllegalArgumentException
     {
-        return this.getModMetaData(this.getMod(modNameOrId), metaDataKey, defaultValue);
+        String mod = this.getMod(modNameOrId);
+        return this.getModMetaData(mod, metaDataKey, defaultValue);
     }
     /**