Revert "Added LeftClickEmpty. (#197)"

This reverts commit cf02fa1

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java

@@ -92,17 +92,17 @@ public Direction getFace() {
 	}
 
 	/**
-	 * @return The effective, i.e. logical, side of this interaction. This will be {@link LogicalSide#CLIENT} on the client thread, and {@link LogicalSide#SERVER} on the server thread.
+	 * @return Convenience method to get the world of this interaction.
 	 */
-	public LogicalSide getSide() {
-		return getWorld().isClient ? LogicalSide.CLIENT : LogicalSide.SERVER;
+	public World getWorld() {
+		return getPlayer().getEntityWorld();
 	}
 
 	/**
-	 * @return Convenience method to get the world of this interaction.
+	 * @return The effective, i.e. logical, side of this interaction. This will be {@link LogicalSide#CLIENT} on the client thread, and {@link LogicalSide#SERVER} on the server thread.
 	 */
-	public World getWorld() {
-		return getPlayer().getEntityWorld();
+	public LogicalSide getSide() {
+		return getWorld().isClient ? LogicalSide.CLIENT : LogicalSide.SERVER;
 	}
 
 	/**
@@ -295,8 +295,10 @@ public RightClickEmpty(PlayerEntity player, Hand hand) {
 	 * This event is fired when a player left clicks while targeting a block.
 	 *
 	 * <p>This event controls which of {@link net.minecraft.block.Block#onBlockBreakStart(BlockState, World, BlockPos, PlayerEntity)} and/or the item harvesting methods will be called.</p>
+
 	 * <p>This event is cancellable.
 	 * Cancelling the event will cause none of the above noted methods to be called.</p>
+
 	 * There are various results to this event, see the getters below.
 	 *
 	 * <p>Note that if the event is canceled and the player holds down left mouse, the event will continue to fire.
@@ -357,9 +359,9 @@ public void setCanceled(boolean canceled) {
 	 *
 	 * <p>This event is not cancellable.</p>
 	 */
-	public static class LeftClickEmpty extends PlayerInteractEvent {
+	/* TODO public static class LeftClickEmpty extends PlayerInteractEvent {
 		public LeftClickEmpty(PlayerEntity player) {
 			super(player, Hand.MAIN_HAND, new BlockPos(player), null);
 		}
-	}
+	}*/
 }

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/player/PlayerPickupXpEvent.java

@@ -23,10 +23,8 @@
 import net.minecraft.entity.player.PlayerEntity;
 
 /**
- * Legacy version of PlayerXpEvent.PickupXp.<br/>
+ * Legacy version of PlayerXpEvent.PickupXp. Mods should move to PickupXp, and
  * this class is removed in 1.15.
- *
- * @deprecated Mods should move to {@link net.minecraftforge.event.entity.player.PlayerXpEvent.PickupXp}
  */
 @Deprecated
 public class PlayerPickupXpEvent extends PlayerXpEvent.PickupXp {

patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/PlayerEvents.java

@@ -22,7 +22,6 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.eventbus.api.Event;
 
 import net.minecraft.entity.ItemEntity;
@@ -60,10 +59,6 @@ public static void firePlayerSmeltedEvent(PlayerEntity player, ItemStack smelted
 		MinecraftForge.EVENT_BUS.post(new PlayerEvent.ItemSmeltedEvent(player, smelted));
 	}
 
-	public static void fireLeftClickEmptyEvent(PlayerEntity player) {
-		MinecraftForge.EVENT_BUS.post(new PlayerInteractEvent.LeftClickEmpty(player));
-	}
-
 	/**
 	 *
 	 * @return -1 if the event was canceled, 0 if the event was denied or had no result set, and 1 if the event was allowed

patchwork-events-entity/src/main/resources/patchwork-events-entity.mixins.json

@@ -32,7 +32,6 @@
     "MixinClientPlayerEntity",
     "MixinClientWorld",
     "MixinItemStack",
-    "MixinMinecraftClient",
     "MixinOtherClientPlayerEntity",
     "MixinPlayerEntityRenderer"
   ],

patchwork-god-classes/src/main/java/net/minecraftforge/common/ForgeHooks.java

@@ -50,7 +50,6 @@
 import net.minecraft.world.World;
 
 import net.patchworkmc.impl.event.entity.EntityEvents;
-import net.patchworkmc.impl.event.entity.PlayerEvents;
 import net.patchworkmc.impl.extensions.block.BlockHarvestManager;
 import net.patchworkmc.impl.loot.LootHooks;
 
@@ -66,10 +65,6 @@ public static int canEntitySpawn(MobEntity entity, IWorld world, double x, doubl
 
 	// TODO: onInteractEntityAt
 
-	public static void onEmptyLeftClick(PlayerEntity player) {
-		PlayerEvents.fireLeftClickEmptyEvent(player);
-	}
-
 	public static ActionResult onInteractEntity(PlayerEntity player, Entity entity, Hand hand) {
 		return EntityEvents.onInteractEntity(player, entity, hand);
 	}