Commit a2e957035519e997f821a9f67880ce1ac0a34627

Authored by Mumfrey
1 parent 77cdfb7b

Bump mixin version and fix some mixin conflicts with sponge

.gitignore
... ... @@ -75,4 +75,6 @@ nb-configuration.xml
75 75 *.ipr
76 76 *.iws
77 77 *.launch
  78 +.factorypath
78 79  
  80 +/.apt_generated/
... ...
build.gradle
... ... @@ -72,7 +72,7 @@ repositories {
72 72 }
73 73  
74 74 dependencies {
75   - compile('org.spongepowered:mixin:0.6.4-SNAPSHOT') {
  75 + compile('org.spongepowered:mixin:0.6.6-SNAPSHOT') {
76 76 exclude module: 'asm-commons'
77 77 exclude module: 'asm-tree'
78 78 exclude module: 'launchwrapper'
... ...
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerInteractionManager.java
... ... @@ -22,7 +22,7 @@ import net.minecraft.util.EnumHand;
22 22 import net.minecraft.util.math.BlockPos;
23 23 import net.minecraft.world.World;
24 24  
25   -@Mixin(PlayerInteractionManager.class)
  25 +@Mixin(value = PlayerInteractionManager.class, priority = 2000)
26 26 public abstract class MixinPlayerInteractionManager
27 27 {
28 28 @Inject(
... ...
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerList.java
... ... @@ -20,7 +20,7 @@ import net.minecraft.network.NetHandlerPlayServer;
20 20 import net.minecraft.network.NetworkManager;
21 21 import net.minecraft.server.management.PlayerList;
22 22  
23   -@Mixin(PlayerList.class)
  23 +@Mixin(value = PlayerList.class, priority = 2000)
24 24 public abstract class MixinPlayerList
25 25 {
26 26 @Inject(
... ...
src/main/java/com/mumfrey/liteloader/core/LiteLoaderMods.java
... ... @@ -296,7 +296,8 @@ public class LiteLoaderMods
296 296 */
297 297 public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws IllegalArgumentException
298 298 {
299   - return this.getModMetaData(this.getMod(modNameOrId), metaDataKey, defaultValue);
  299 + String mod = this.getMod(modNameOrId);
  300 + return this.getModMetaData(mod, metaDataKey, defaultValue);
300 301 }
301 302  
302 303 /**
... ...