Commit e3bff095054f71a78685294ad44dfd4a5fa27d03

Authored by Mumfrey
1 parent 5f76a0da

Update to Mixin 0.6.1 and production mappings

build.gradle
@@ -72,7 +72,7 @@ repositories { @@ -72,7 +72,7 @@ repositories {
72 } 72 }
73 73
74 dependencies { 74 dependencies {
75 - compile('org.spongepowered:mixin:0.6-SNAPSHOT') { 75 + compile('org.spongepowered:mixin:0.6.1-SNAPSHOT') {
76 exclude module: 'asm-commons' 76 exclude module: 'asm-commons'
77 exclude module: 'asm-tree' 77 exclude module: 'asm-tree'
78 exclude module: 'launchwrapper' 78 exclude module: 'launchwrapper'
gradle.properties
@@ -7,4 +7,4 @@ organization=LiteLoader @@ -7,4 +7,4 @@ organization=LiteLoader
7 buildType=SNAPSHOT 7 buildType=SNAPSHOT
8 buildVersion=1.11 8 buildVersion=1.11
9 mcVersion=1.11 9 mcVersion=1.11
10 -mcMappings=snapshot_custom  
11 \ No newline at end of file 10 \ No newline at end of file
  11 +mcMappings=snapshot_20161124
12 \ No newline at end of file 12 \ No newline at end of file
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
@@ -40,7 +40,7 @@ public abstract class MixinMinecraft implements IMinecraft @@ -40,7 +40,7 @@ public abstract class MixinMinecraft implements IMinecraft
40 @Shadow private void rightClickMouse() {} 40 @Shadow private void rightClickMouse() {}
41 @Shadow private void middleClickMouse() {} 41 @Shadow private void middleClickMouse() {}
42 42
43 - @Inject(method = "startGame()V", at = @At("RETURN")) 43 + @Inject(method = "init()V", at = @At("RETURN"))
44 private void onStartupComplete(CallbackInfo ci) 44 private void onStartupComplete(CallbackInfo ci)
45 { 45 {
46 ClientProxy.onStartupComplete(); 46 ClientProxy.onStartupComplete();
src/main/java/com/mumfrey/liteloader/common/mixin/MixinNetHandlerPlayServer.java
@@ -32,7 +32,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler @@ -32,7 +32,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
32 @Shadow private Vec3d targetPos; 32 @Shadow private Vec3d targetPos;
33 33
34 @Inject( 34 @Inject(
35 - method = "processPlayerBlockPlacement(Lnet/minecraft/network/play/client/CPacketPlayerTryUseItem;)V", 35 + method = "processTryUseItem(Lnet/minecraft/network/play/client/CPacketPlayerTryUseItem;)V",
36 cancellable = true, 36 cancellable = true,
37 at = @At( 37 at = @At(
38 value = "INVOKE", 38 value = "INVOKE",
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
@@ -450,10 +450,10 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe @@ -450,10 +450,10 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe
450 450
451 public boolean onBlockClicked(BlockPos pos, EnumFacing side, PlayerInteractionManager manager) 451 public boolean onBlockClicked(BlockPos pos, EnumFacing side, PlayerInteractionManager manager)
452 { 452 {
453 - EntityPlayerMP player = manager.thisPlayerMP; 453 + EntityPlayerMP player = manager.player;
454 if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, side)) 454 if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, side))
455 { 455 {
456 - SPacketBlockChange cancellation = new SPacketBlockChange(manager.theWorld, pos); 456 + SPacketBlockChange cancellation = new SPacketBlockChange(manager.world, pos);
457 player.connection.sendPacket(cancellation); 457 player.connection.sendPacket(cancellation);
458 return false; 458 return false;
459 } 459 }