adding PlayerMoveListener

Mumfrey
1 parent 1b0e9c50
Showing 11 changed files with 409 additions and 157 deletions
java/client/com/mumfrey/liteloader/client/CallbackProxyClient.java
java/common/com/mumfrey/liteloader/PlayerInteractionListener.java
java/common/com/mumfrey/liteloader/PlayerMoveListener.java
java/common/com/mumfrey/liteloader/common/GameEngine.java
java/common/com/mumfrey/liteloader/common/transformers/LiteLoaderEventTransformer.java
java/common/com/mumfrey/liteloader/core/CallbackProxyCommon.java
java/common/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
java/common/com/mumfrey/liteloader/core/runtime/Methods.java
java/common/com/mumfrey/liteloader/transformers/event/EventTransformer.java
java/common/com/mumfrey/liteloader/util/Position.java
java/common/com/mumfrey/liteloader/util/PrivateFields.java
@@ -13,28 +13,14 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.client.C07PacketPlayerDigging;
-import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
-import net.minecraft.network.play.client.C0APacketAnimation;
-import net.minecraft.network.play.server.S23PacketBlockChange;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.server.management.ItemInWorldManager;
-import net.minecraft.server.management.ServerConfigurationManager;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ScreenShotHelper;
 import net.minecraft.util.Session;
-import net.minecraft.world.World;
 import net.minecraft.world.WorldSettings;
 import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType;
+import com.mumfrey.liteloader.core.CallbackProxyCommon;
 import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
@@ -45,29 +31,33 @@ import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
  * 
  * @author Adam Mummery-Smith
  */
-public class CallbackProxyClient
+public abstract class CallbackProxyClient extends CallbackProxyCommon
 {
-	private static LiteLoaderEventBrokerClient eventBroker;
+	private static LiteLoaderEventBrokerClient clientEventBroker;
 	private static boolean fboEnabled;
 	private static boolean renderingFBO;
+	private CallbackProxyClient() {}
+	
 	public static void onStartupComplete(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.eventBroker = LiteLoaderEventBrokerClient.getInstance();
+		CallbackProxyCommon.onStartupComplete();
+		
+		CallbackProxyClient.clientEventBroker = LiteLoaderEventBrokerClient.getInstance();
-		if (CallbackProxyClient.eventBroker == null)
+		if (CallbackProxyClient.clientEventBroker == null)
 		{
 			throw new RuntimeException("LiteLoader failed to start up properly. The game is in an unstable state and must shut down now. Check the developer log for startup errors");
 		}
-		CallbackProxyClient.eventBroker.onStartupComplete();
+		CallbackProxyClient.clientEventBroker.onStartupComplete();
 	}
 	public static void onTimerUpdate(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.eventBroker.onTimerUpdate();
+		CallbackProxyClient.clientEventBroker.onTimerUpdate();
 	}
 	public static void newTick(EventInfo<Minecraft> e)
@@ -76,124 +66,99 @@ public class CallbackProxyClient
 	public static void onTick(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.eventBroker.onTick();
+		CallbackProxyClient.clientEventBroker.onTick();
 	}
 	public static void onRender(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.eventBroker.onRender();
+		CallbackProxyClient.clientEventBroker.onRender();
 	}
 	public static void preRenderGUI(EventInfo<EntityRenderer> e, float partialTicks)
 	{
-		CallbackProxyClient.eventBroker.preRenderGUI(partialTicks);
+		CallbackProxyClient.clientEventBroker.preRenderGUI(partialTicks);
 	}
 	public static void onSetupCameraTransform(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.eventBroker.onSetupCameraTransform(partialTicks, timeSlice);
+		CallbackProxyClient.clientEventBroker.onSetupCameraTransform(partialTicks, timeSlice);
 	}
 	public static void postRenderEntities(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.eventBroker.postRenderEntities(partialTicks, timeSlice);
+		CallbackProxyClient.clientEventBroker.postRenderEntities(partialTicks, timeSlice);
 	}
 	public static void postRender(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.eventBroker.postRender(partialTicks, timeSlice);
+		CallbackProxyClient.clientEventBroker.postRender(partialTicks, timeSlice);
 	}
 	public static void onRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
 	{
-		CallbackProxyClient.eventBroker.onRenderHUD(partialTicks);
+		CallbackProxyClient.clientEventBroker.onRenderHUD(partialTicks);
 	}
 	public static void onRenderChat(EventInfo<GuiIngame> e, float partialTicks)
 	{
-		CallbackProxyClient.eventBroker.onRenderChat(e.getSource().getChatGUI(), partialTicks);
+		CallbackProxyClient.clientEventBroker.onRenderChat(e.getSource().getChatGUI(), partialTicks);
 	}
 	public static void postRenderChat(EventInfo<GuiIngame> e, float partialTicks)
 	{
-		CallbackProxyClient.eventBroker.postRenderChat(e.getSource().getChatGUI(), partialTicks);
+		CallbackProxyClient.clientEventBroker.postRenderChat(e.getSource().getChatGUI(), partialTicks);
 	}
 	public static void postRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
 	{
-		CallbackProxyClient.eventBroker.postRenderHUD(partialTicks);
+		CallbackProxyClient.clientEventBroker.postRenderHUD(partialTicks);
 	}
 	public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName, WorldSettings worldSettings)
 	{
-		CallbackProxyClient.eventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
-	}
-	
-	public static void onInitializePlayerConnection(EventInfo<ServerConfigurationManager> e, NetworkManager netManager, EntityPlayerMP player)
-	{
-		CallbackProxyClient.eventBroker.onInitializePlayerConnection(e.getSource(), netManager, player);
-	}
-
-	public static void onPlayerLogin(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
-	{
-		CallbackProxyClient.eventBroker.onPlayerLogin(e.getSource(), player);
-	}
-	
-	public static void onPlayerLogout(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
-	{
-		CallbackProxyClient.eventBroker.onPlayerLogout(e.getSource(), player);
-	}
-	
-	public static void onSpawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, GameProfile profile)
-	{
-		CallbackProxyClient.eventBroker.onSpawnPlayer(e.getSource(), e.getReturnValue(), profile);
-	}
-
-	public static void onRespawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, EntityPlayerMP oldPlayer, int dimension, boolean won)
-	{
-		CallbackProxyClient.eventBroker.onRespawnPlayer(e.getSource(), e.getReturnValue(), oldPlayer, dimension, won);
+		CallbackProxyClient.clientEventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
 	}
 	public static void onOutboundChat(EventInfo<EntityPlayerSP> e, String message)
 	{
-		CallbackProxyClient.eventBroker.onSendChatMessage(e, message);
+		CallbackProxyClient.clientEventBroker.onSendChatMessage(e, message);
 	}
 	public static void onResize(EventInfo<Minecraft> e)
 	{
-		if (CallbackProxyClient.eventBroker == null) return;
-		CallbackProxyClient.eventBroker.onResize(e.getSource());
+		if (CallbackProxyClient.clientEventBroker == null) return;
+		CallbackProxyClient.clientEventBroker.onResize(e.getSource());
 	}
 	public static void preRenderFBO(EventInfo<Minecraft> e)
 	{
-		if (CallbackProxyClient.eventBroker == null) return;
+		if (CallbackProxyClient.clientEventBroker == null) return;
 		CallbackProxyClient.fboEnabled = OpenGlHelper.isFramebufferEnabled();
 		if (CallbackProxyClient.fboEnabled)
 		{
 			CallbackProxyClient.renderingFBO = true;
-			CallbackProxyClient.eventBroker.preRenderFBO(e.getSource().getFramebuffer());
+			CallbackProxyClient.clientEventBroker.preRenderFBO(e.getSource().getFramebuffer());
 		}
 	}
 	public static void postRenderFBO(EventInfo<Minecraft> e)
 	{
-		if (CallbackProxyClient.eventBroker == null) return;
+		if (CallbackProxyClient.clientEventBroker == null) return;
 		CallbackProxyClient.renderingFBO = false;
 		if (CallbackProxyClient.fboEnabled)
 		{
-			CallbackProxyClient.eventBroker.postRenderFBO(e.getSource().getFramebuffer());
+			CallbackProxyClient.clientEventBroker.postRenderFBO(e.getSource().getFramebuffer());
 		}
 	}
 	public static void renderFBO(EventInfo<Framebuffer> e, int width, int height, boolean flag)
 	{
-		if (CallbackProxyClient.eventBroker == null) return;
+		if (CallbackProxyClient.clientEventBroker == null) return;
 		if (CallbackProxyClient.renderingFBO)
 		{
-			CallbackProxyClient.eventBroker.onRenderFBO(e.getSource(), width, height);
+			CallbackProxyClient.clientEventBroker.onRenderFBO(e.getSource(), width, height);
 		}
 		CallbackProxyClient.renderingFBO = false;
@@ -201,96 +166,22 @@ public class CallbackProxyClient
 	public static void onRenderWorld(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.eventBroker.onRenderWorld(partialTicks, timeSlice);
+		CallbackProxyClient.clientEventBroker.onRenderWorld(partialTicks, timeSlice);
 	}
 	public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height, Framebuffer fbo)
 	{
-		CallbackProxyClient.eventBroker.onScreenshot(e, name, width, height, fbo);
+		CallbackProxyClient.clientEventBroker.onScreenshot(e, name, width, height, fbo);
 	}
 	public static void onRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
 	{
-		CallbackProxyClient.eventBroker.onRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
+		CallbackProxyClient.clientEventBroker.onRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
 	}
 	public static void onPostRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
 	{
-		CallbackProxyClient.eventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
-	}
-	
-	public static void onServerTick(EventInfo<MinecraftServer> e)
-	{
-		CallbackProxyClient.eventBroker.onServerTick(e.getSource());
-	}
-	
-	public static void onPlaceBlock(EventInfo<NetHandlerPlayServer> e, C08PacketPlayerBlockPlacement packet)
-	{
-		NetHandlerPlayServer netHandler = e.getSource();
-		
-		EntityPlayerMP playerMP = netHandler.playerEntity;
-		BlockPos pos = packet.getPosition();
-		EnumFacing facing = EnumFacing.getFront(packet.getPlacedBlockDirection());
-		if (!CallbackProxyClient.eventBroker.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, playerMP, pos, facing))
-		{
-			S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos.offset(facing));
-			netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation);
-			playerMP.sendContainerToPlayer(playerMP.inventoryContainer);
-			e.cancel();
-		}
-	}
-	
-	public static void onClickedAir(EventInfo<NetHandlerPlayServer> e, C0APacketAnimation packet)
-	{
-		NetHandlerPlayServer netHandler = e.getSource();
-		if (!CallbackProxyClient.eventBroker.onPlayerInteract(InteractType.LEFT_CLICK, netHandler.playerEntity, null, EnumFacing.SOUTH))
-		{
-			e.cancel();
-		}
-	}
-
-	public static void onPlayerDigging(EventInfo<NetHandlerPlayServer> e, C07PacketPlayerDigging packet)
-	{
-		if (packet.getStatus() == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK)
-		{
-			NetHandlerPlayServer netHandler = e.getSource();
-			BlockPos pos = packet.func_179715_a();
-			EntityPlayerMP playerMP = netHandler.playerEntity;
-			if (!CallbackProxyClient.eventBroker.onPlayerInteract(InteractType.DIG_BLOCK_MAYBE, playerMP, pos, EnumFacing.SOUTH))
-			{
-				S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos);
-				netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation);
-				e.cancel();
-			}
-		}
-	}
-	
-	public static void onUseItem(ReturnEventInfo<ItemInWorldManager, Boolean> e, EntityPlayer player, World world, ItemStack itemStack, BlockPos pos, EnumFacing side, float par8, float par9, float par10)
-	{
-		if (player instanceof EntityPlayerMP)
-		{
-			EntityPlayerMP playerMP = (EntityPlayerMP)player;
-			
-			if (!CallbackProxyClient.eventBroker.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, playerMP, pos, side))
-			{
-				System.err.println(pos);
-				S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos);
-				playerMP.playerNetServerHandler.sendPacket(cancellation);
-				e.setReturnValue(false);
-			}
-		}
-	}
-	
-	public static void onBlockClicked(EventInfo<ItemInWorldManager> e, BlockPos pos, EnumFacing side)
-	{
-		ItemInWorldManager manager = e.getSource();
-		
-		if (!CallbackProxyClient.eventBroker.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, manager.thisPlayerMP, pos, side))
-		{
-			S23PacketBlockChange cancellation = new S23PacketBlockChange(manager.theWorld, pos);
-			manager.thisPlayerMP.playerNetServerHandler.sendPacket(cancellation);
-			e.cancel();
-		}
+		CallbackProxyClient.clientEventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
 	}
 	/**
@@ -44,7 +44,7 @@ public interface PlayerInteractionListener extends LiteMod
 	 * @param button Mouse button that was pressed (left = dig, right = interact/place)
 	 * @param hitPos Block which was *hit*. Note that block placement will normally be at hitPos.offset(sideHit) 
 	 * @param sideHit Side of the block which was hit
-	 * @return
+	 * @return true to allow the action to be processed (another listener may still inhibit the action), return false to cancel the action (other listeners will still be notified)
 	 */
 	public abstract boolean onPlayerClickedBlock(EntityPlayerMP player, MouseButton button, BlockPos hitPos, EnumFacing sideHit);
 }
+package com.mumfrey.liteloader;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
+import com.mumfrey.liteloader.util.Position;
+
+/**
+ * Interface for mods which want to monitor or control player movements
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface PlayerMoveListener extends LiteMod
+{
+	/**
+	 * Called when a movement/look packet is received from the client. 
+	 * 
+	 * @param playerMP Player moving
+	 * @param from Player's previous recorded position
+	 * @param to Position the player is attempting to move to
+	 * @param newPos Set this position to teleport the player to newPos instead of processing the original move
+	 * 
+	 * @return false to cancel the event or true to allow the movement to be processed as normal or newPos to be applied
+	 */
+	public abstract boolean onPlayerMove(EntityPlayerMP playerMP, Position from, Position to, ReturnValue<Position> newPos);
+}
@@ -50,7 +50,7 @@ public interface GameEngine&lt;TClient, TServer extends MinecraftServer&gt;
 	public abstract TServer getServer();
 	/**
-	 * @return
+	 * Get the resources manager
 	 */
 	public abstract Resources<?, ?> getResources();
@@ -3,11 +3,14 @@ package com.mumfrey.liteloader.common.transformers;
 import static com.mumfrey.liteloader.core.runtime.Methods.*;
 import static com.mumfrey.liteloader.transformers.event.InjectionPoint.*;
+import org.objectweb.asm.Opcodes;
+
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.transformers.event.Event;
 import com.mumfrey.liteloader.transformers.event.EventInjectionTransformer;
 import com.mumfrey.liteloader.transformers.event.InjectionPoint;
 import com.mumfrey.liteloader.transformers.event.MethodInfo;
+import com.mumfrey.liteloader.transformers.event.inject.BeforeFieldAccess;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeInvoke;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeNew;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeReturn;
@@ -25,7 +28,7 @@ public abstract class LiteLoaderEventTransformer extends EventInjectionTransform
 	@Override
 	protected void addEvents()
 	{
-		// Event declaraions
+		// Event declarations
 		Event onInitializePlayerConnection     = Event.getOrCreate("onInitializePlayerConnection", false);
 		Event onPlayerLogin                    = Event.getOrCreate("onPlayerLogin",                false);
 		Event onPlayerLogout                   = Event.getOrCreate("onPlayerLogout",               false);
@@ -38,12 +41,14 @@ public abstract class LiteLoaderEventTransformer extends EventInjectionTransform
 		Event onPlaceBlock                     = Event.getOrCreate("onPlaceBlock",                 true);
 		Event onClickedAir                     = Event.getOrCreate("onClickedAir",                 true);
 		Event onSessionProfileBad              = Event.getOrCreate("onSessionProfileBad",          true);
+		Event onPlayerMoved                    = Event.getOrCreate("onPlayerMoved",                true);
 		// Injection Points
 		InjectionPoint methodHead              = new MethodHead();
 		InjectionPoint methodReturn            = new BeforeReturn();
 		InjectionPoint beforeNewGameProfile    = new BeforeNew(1, Obf.GameProfile);
 		InjectionPoint beforeThreadMarshall    = new BeforeInvoke(checkThreadAndEnqueue);
+		InjectionPoint beforeGetPosY           = new BeforeFieldAccess(Opcodes.GETFIELD, Obf.entityPosY, Obf.EntityPlayerMP, 4).setCaptureLocals(true);
 		// Hooks
 		this.add(onInitializePlayerConnection, initPlayerConnection,        (methodReturn),          "onInitializePlayerConnection");
@@ -57,9 +62,10 @@ public abstract class LiteLoaderEventTransformer extends EventInjectionTransform
 		this.add(onPlaceBlock,                 processBlockPlacement,  after(beforeThreadMarshall) , "onPlaceBlock");
 		this.add(onClickedAir,                 handleAnimation,        after(beforeThreadMarshall),  "onClickedAir");
 		this.add(onPlayerDigging,              processPlayerDigging,   after(beforeThreadMarshall),  "onPlayerDigging");
+		this.add(onPlayerMoved,                processPlayer,               (beforeGetPosY),         "onPlayerMoved");
 		// Compatibility handlers
-		this.add(onSessionProfileBad,          getProfile,           (beforeNewGameProfile), "generateOfflineUUID");
+		this.add(onSessionProfileBad,          getProfile,                  (beforeNewGameProfile),  "generateOfflineUUID");
 	}
 	protected final Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback)
+package com.mumfrey.liteloader.core;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.play.client.C03PacketPlayer;
+import net.minecraft.network.play.client.C07PacketPlayerDigging;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ItemInWorldManager;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+
+import com.mojang.authlib.GameProfile;
+import com.mumfrey.liteloader.transformers.event.EventInfo;
+import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
+
+public abstract class CallbackProxyCommon
+{
+	private static LiteLoaderEventBroker<?, ?> eventBroker;
+	
+	protected CallbackProxyCommon() {}
+
+	protected static void onStartupComplete()
+	{
+		CallbackProxyCommon.eventBroker = LiteLoaderEventBroker.broker;
+		
+		if (CallbackProxyCommon.eventBroker == null)
+		{
+			throw new RuntimeException("LiteLoader failed to start up properly. The game is in an unstable state and must shut down now. Check the developer log for startup errors");
+		}
+	}
+	
+	public static void onInitializePlayerConnection(EventInfo<ServerConfigurationManager> e, NetworkManager netManager, EntityPlayerMP player)
+	{
+		CallbackProxyCommon.eventBroker.onInitializePlayerConnection(e.getSource(), netManager, player);
+	}
+
+	public static void onPlayerLogin(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
+	{
+		CallbackProxyCommon.eventBroker.onPlayerLogin(e.getSource(), player);
+	}
+	
+	public static void onPlayerLogout(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
+	{
+		CallbackProxyCommon.eventBroker.onPlayerLogout(e.getSource(), player);
+	}
+	
+	public static void onSpawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, GameProfile profile)
+	{
+		CallbackProxyCommon.eventBroker.onSpawnPlayer(e.getSource(), e.getReturnValue(), profile);
+	}
+
+	public static void onRespawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, EntityPlayerMP oldPlayer, int dimension, boolean won)
+	{
+		CallbackProxyCommon.eventBroker.onRespawnPlayer(e.getSource(), e.getReturnValue(), oldPlayer, dimension, won);
+	}
+	
+	public static void onServerTick(EventInfo<MinecraftServer> e)
+	{
+		CallbackProxyCommon.eventBroker.onServerTick(e.getSource());
+	}
+	
+	public static void onPlaceBlock(EventInfo<NetHandlerPlayServer> e, C08PacketPlayerBlockPlacement packet)
+	{
+		NetHandlerPlayServer netHandler = e.getSource();
+		if (!CallbackProxyCommon.eventBroker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(), EnumFacing.getFront(packet.getPlacedBlockDirection())))
+		{
+			e.cancel();
+		}
+	}
+	
+	public static void onClickedAir(EventInfo<NetHandlerPlayServer> e, C0APacketAnimation packet)
+	{
+		if (!CallbackProxyCommon.eventBroker.onClickedAir(e.getSource()))
+		{
+			e.cancel();
+		}
+	}
+
+	public static void onPlayerDigging(EventInfo<NetHandlerPlayServer> e, C07PacketPlayerDigging packet)
+	{
+		if (packet.getStatus() == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK)
+		{
+			NetHandlerPlayServer netHandler = e.getSource();
+			if (!CallbackProxyCommon.eventBroker.onPlayerDigging(netHandler, packet.func_179715_a(), netHandler.playerEntity))
+			{
+				e.cancel();
+			}
+		}
+	}
+	
+	public static void onUseItem(ReturnEventInfo<ItemInWorldManager, Boolean> e, EntityPlayer player, World world, ItemStack itemStack, BlockPos pos, EnumFacing side, float par8, float par9, float par10)
+	{
+		if (!(player instanceof EntityPlayerMP))
+		{
+			return;
+		}
+			
+		if (!CallbackProxyCommon.eventBroker.onUseItem(pos, side, (EntityPlayerMP)player))
+		{
+			e.setReturnValue(false);
+		}
+	}
+	
+	public static void onBlockClicked(EventInfo<ItemInWorldManager> e, BlockPos pos, EnumFacing side)
+	{
+		ItemInWorldManager manager = e.getSource();
+		
+		if (!CallbackProxyCommon.eventBroker.onBlockClicked(pos, side, manager))
+		{
+			e.cancel();
+		}
+	}
+	
+	public static void onPlayerMoved(EventInfo<NetHandlerPlayServer> e, C03PacketPlayer packet, WorldServer world, double oldPosX, double oldPosY, double oldPosZ)
+	{
+		NetHandlerPlayServer netHandler = e.getSource();
+		if (!CallbackProxyCommon.eventBroker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
+		{
+			e.cancel();
+		}
+	}
+	
+	public static void onPlayerMoved(EventInfo<NetHandlerPlayServer> e, C03PacketPlayer packet, WorldServer world, double oldPosX, double oldPosY, double oldPosZ, double deltaMoveSq, double deltaX, double deltaY, double deltaZ)
+	{
+		NetHandlerPlayServer netHandler = e.getSource();
+		if (!CallbackProxyCommon.eventBroker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
+		{
+			e.cancel();
+		}
+	}
+}
 package com.mumfrey.liteloader.core;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -7,21 +8,28 @@ import java.util.UUID;
 import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
+import net.minecraft.network.play.client.C03PacketPlayer;
 import net.minecraft.network.play.client.C15PacketClientSettings;
+import net.minecraft.network.play.server.S08PacketPlayerPosLook;
+import net.minecraft.network.play.server.S23PacketBlockChange;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.ItemInWorldManager;
 import net.minecraft.server.management.ServerConfigurationManager;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.MovingObjectPosition.MovingObjectType;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings;
 import com.mojang.authlib.GameProfile;
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.PlayerInteractionListener;
 import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
+import com.mumfrey.liteloader.PlayerMoveListener;
 import com.mumfrey.liteloader.PluginChannelListener;
 import com.mumfrey.liteloader.ServerCommandProvider;
 import com.mumfrey.liteloader.ServerPlayerListener;
@@ -35,6 +43,7 @@ import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.interfaces.FastIterable;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.launch.LoaderProperties;
+import com.mumfrey.liteloader.util.Position;
 import com.mumfrey.liteloader.util.PrivateFields;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -132,6 +141,11 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	private FastIterable<PlayerInteractionListener> playerInteractionListeners = new HandlerList<PlayerInteractionListener>(PlayerInteractionListener.class, ReturnLogicOp.AND);
 	/**
+	 * List of mods which handle player movement events
+	 */
+	private FastIterable<PlayerMoveListener> playerMoveListeners = new HandlerList<PlayerMoveListener>(PlayerMoveListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+	
+	/**
 	 * ctor
 	 * 
 	 * @param loader
@@ -187,6 +201,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 		delegate.registerInterface(ServerCommandProvider.class);
 		delegate.registerInterface(ServerPlayerListener.class);
 		delegate.registerInterface(PlayerInteractionListener.class);
+		delegate.registerInterface(PlayerMoveListener.class);
 		delegate.registerInterface(CommonPluginChannelListener.class);
 	}
@@ -226,6 +241,14 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	{
 		this.playerInteractionListeners.add(playerInteractionListener);
 	}
+	
+	/**
+	 * @param playerMoveListener
+	 */
+	public void addPlayerMoveListener(PlayerMoveListener playerMoveListener)
+	{
+		this.playerMoveListeners.add(playerMoveListener);
+	}
 	/**
 	 * @param instance
@@ -331,6 +354,60 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 		this.playerStateList.all().onTick();
 	}
+	public boolean onPlaceBlock(NetHandlerPlayServer netHandler, EntityPlayerMP playerMP, BlockPos pos, EnumFacing facing)
+	{
+		if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, playerMP, pos, facing))
+		{
+			S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos.offset(facing));
+			netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation);
+			playerMP.sendContainerToPlayer(playerMP.inventoryContainer);
+			return false;
+		}
+		
+		return true;
+	}
+
+	public boolean onClickedAir(NetHandlerPlayServer netHandler)
+	{
+		return this.onPlayerInteract(InteractType.LEFT_CLICK, netHandler.playerEntity, null, EnumFacing.SOUTH);
+	}
+
+	public boolean onPlayerDigging(NetHandlerPlayServer netHandler, BlockPos pos, EntityPlayerMP playerMP)
+	{
+		if (!this.onPlayerInteract(InteractType.DIG_BLOCK_MAYBE, playerMP, pos, EnumFacing.SOUTH))
+		{
+			S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos);
+			netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation);
+			return false;
+		}
+		
+		return true;
+	}
+
+	public boolean onUseItem(BlockPos pos, EnumFacing side, EntityPlayerMP playerMP)
+	{
+		if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, playerMP, pos, side))
+		{
+			S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos);
+			playerMP.playerNetServerHandler.sendPacket(cancellation);
+			return false;
+		}
+		
+		return true;
+	}
+
+	public boolean onBlockClicked(BlockPos pos, EnumFacing side, ItemInWorldManager manager)
+	{
+		if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, manager.thisPlayerMP, pos, side))
+		{
+			S23PacketBlockChange cancellation = new S23PacketBlockChange(manager.theWorld, pos);
+			manager.thisPlayerMP.playerNetServerHandler.sendPacket(cancellation);
+			return false;
+		}
+		
+		return true;
+	}
+
 	public boolean onPlayerInteract(InteractType action, EntityPlayerMP player, BlockPos position, EnumFacing side)
 	{
 		PlayerEventState eventState = this.getPlayerState(player);
@@ -346,7 +423,50 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	{
 		return this.playerInteractionListeners.all().onPlayerClickedBlock(player, button, hitPos, sideHit);
 	}
-	
+
+	public boolean onPlayerMove(NetHandlerPlayServer netHandler, C03PacketPlayer packet, EntityPlayerMP playerMP, WorldServer world)
+	{
+		Position from = new Position(playerMP, true);
+		
+		double toX = playerMP.posX;
+		double toY = playerMP.posY;
+		double toZ = playerMP.posZ;
+		float toYaw = playerMP.rotationYaw;
+		float toPitch = playerMP.rotationPitch;
+		
+		if (packet.isMoving())
+		{
+			toX = packet.getPositionX();
+			toY = packet.getPositionY();
+			toZ = packet.getPositionZ();
+		}
+		
+		if (packet.getRotating())
+		{
+			toYaw = packet.getYaw();
+			toPitch = packet.getPitch();
+		}
+
+		Position to = new Position(toX, toY, toZ, toYaw, toPitch);
+		ReturnValue<Position> pos = new ReturnValue<Position>(to);
+		
+		if (!this.playerMoveListeners.all().onPlayerMove(playerMP, from, to, pos))
+		{
+			playerMP.setPositionAndRotation(from.xCoord, from.yCoord, from.zCoord, playerMP.prevRotationYaw, playerMP.prevRotationPitch);
+			playerMP.playerNetServerHandler.sendPacket(new S08PacketPlayerPosLook(from.xCoord, from.yCoord, from.zCoord, playerMP.prevRotationYaw, playerMP.prevRotationPitch, Collections.emptySet()));
+			return false;
+		}
+		
+		if (pos.isSet())
+		{
+			Position newPos = pos.get();
+			netHandler.setPlayerLocation(newPos.xCoord, newPos.yCoord, newPos.zCoord, newPos.yaw, newPos.pitch);
+			return false;
+		}
+		
+		return true;
+	}
+
 	void onPlayerSettingsReceived(EntityPlayerMP player, C15PacketClientSettings packet)
 	{
 		this.getPlayerState(player).setTraceDistance(PrivateFields.viewDistance.get(packet));
@@ -49,6 +49,7 @@ public abstract class Methods
 	public static final MethodInfo processPlayerDigging   = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayerDigging,         Void.TYPE, Packets.C07PacketPlayerDigging);
 	public static final MethodInfo serverJobs             = new MethodInfo(Obf.MinecraftServer,            Obf.updateTimeLightAndEntities,   Void.TYPE);
 	public static final MethodInfo checkThreadAndEnqueue  = new MethodInfo(Obf.PacketThreadUtil,           Obf.checkThreadAndEnqueue);
+	public static final MethodInfo processPlayer          = new MethodInfo(Obf.NetHandlerPlayServer,       Obf.processPlayer,                Void.TYPE, Packets.C03PacketPlayer);
 	// Profiler
 	public static final MethodInfo startSection           = new MethodInfo(Obf.Profiler,                   Obf.startSection,                 Void.TYPE, String.class);
 package com.mumfrey.liteloader.transformers.event;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -9,6 +11,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.core.helpers.Booleans;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
@@ -17,6 +21,7 @@ import org.objectweb.asm.tree.LocalVariableNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.util.CheckClassAdapter;
+import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.transformers.ByteCodeUtilities;
 import com.mumfrey.liteloader.transformers.ClassTransformer;
 import com.mumfrey.liteloader.transformers.ObfProvider;
@@ -52,6 +57,10 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public final class EventTransformer extends ClassTransformer
 {
+	public static final boolean DUMP = Booleans.parseBoolean(System.getProperty("liteloader.debug.dump"), false);
+
+	public static final boolean VALIDATE = Booleans.parseBoolean(System.getProperty("liteloader.debug.validate"), false);
+
 	/**
 	 * Multidimensional map of class names -> target method signatures -> events to inject 
 	 */
@@ -59,11 +68,6 @@ public final class EventTransformer extends ClassTransformer
 	private static AccessorTransformer accessorTransformer;
-	/**
-	 * Runs the validator on the generated classes, only for debugging purposes 
-	 */
-	private final boolean runValidator = false;
-	
 	private int globalEventID = 0;
 	static class Injection
@@ -246,13 +250,24 @@ public final class EventTransformer extends ClassTransformer
 			EventTransformer.accessorTransformer.apply(name, transformedName, basicClass, classNode);
 		}
-		if (this.runValidator)
+		if (EventTransformer.VALIDATE)
 		{
 			ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
 			classNode.accept(new CheckClassAdapter(writer));
 		}
-		return this.writeClass(classNode);
+		byte[] bytes = this.writeClass(classNode);
+
+		if (EventTransformer.DUMP)
+		{
+			try
+			{
+				FileUtils.writeByteArrayToFile(new File(".classes" + Obf.lookupMCPName(transformedName).replace('.', '/') + ".class"), bytes);
+			}
+			catch (IOException ex) {}
+		}
+		
+		return bytes;
 	}
 	/**
+package com.mumfrey.liteloader.util;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.Vec3;
+
+/**
+ * A 3D vector position with rotation as well
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class Position extends Vec3
+{
+	public final float yaw;
+	
+	public final float pitch;
+	
+	public Position(double x, double y, double z)
+	{
+		this(x, y, z, 0.0F, 0.0F);
+	}
+	
+	public Position(double x, double y, double z, float yaw, float pitch)
+	{
+		super(x, y, z);
+		
+		this.yaw = yaw;
+		this.pitch = pitch;
+	}
+	
+	public Position(Entity entity)
+	{
+		this(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
+	}
+	
+	public Position(Entity entity, boolean usePrevious)
+	{
+		this(usePrevious ? entity.prevPosX : entity.posX, usePrevious ? entity.prevPosY : entity.posY, usePrevious ? entity.prevPosZ : entity.posZ, usePrevious ? entity.prevRotationYaw : entity.rotationYaw, usePrevious ? entity.prevRotationPitch : entity.rotationPitch);
+	}
+	
+	public void applyTo(Entity entity)
+	{
+		entity.posX = this.xCoord;
+		entity.posY = this.yCoord;
+		entity.posZ = this.zCoord;
+		entity.rotationYaw = this.yaw;
+		entity.rotationPitch = this.pitch;
+	}
+
+    @Override
+	public String toString()
+    {
+        return "(" + this.xCoord + ", " + this.yCoord + ", " + this.zCoord + ", " + this.yaw + ", " + this.pitch + ")";
+    }
+}
@@ -37,7 +37,7 @@ public class PrivateFields&lt;P, T&gt;
 	protected PrivateFields(Class<P> owner, Obf obf)
 	{
 		this.parentClass = owner;
-		this.fieldName = Obf.getObfuscatedFieldName(obf);
+		this.fieldName = ObfuscationUtilities.getObfuscatedFieldName(obf);
 	}
 	/**