Add a NetUtils and fix tool break protection once and for all

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/CoreModSanityCheck.java

@@ -27,7 +27,7 @@ public void accept(PlayerTickEvent t) {
 	}
 
 	@Override
-	public boolean isOneTime() {
+	public boolean wasFinalAction() {
 		return true;
 	}
 

src/main/java/net/earthcomputer/clientcommands/EventManager.java

@@ -495,7 +495,7 @@ public void onPostDamageItem(ToolDamagedEvent.Post e) {
 	public static interface Listener<E extends Event> {
 		void accept(E e);
 
-		default boolean isOneTime() {
+		default boolean wasFinalAction() {
 			return false;
 		}
 	}
@@ -506,7 +506,7 @@ private static class Listeners<E extends Event> {
 		public void invoke(E e) {
 			for (Listener<E> listener : new ArrayList<>(listeners)) {
 				listener.accept(e);
-				if (listener.isOneTime()) {
+				if (listener.wasFinalAction()) {
 					listeners.remove(listener);
 				}
 			}

src/main/java/net/earthcomputer/clientcommands/SpecialActionKey.java

@@ -2,6 +2,7 @@
 
 import org.lwjgl.input.Keyboard;
 
+import net.earthcomputer.clientcommands.network.NetUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.settings.KeyBinding;
@@ -44,8 +45,8 @@ public static void registerEvents() {
 			if (packet instanceof CPacketPlayerTryUseItemOnBlock) {
 				if (isSpecialActionKeyPressed()) {
 					EntityPlayerSP player = Minecraft.getMinecraft().player;
-					Minecraft.getMinecraft().getConnection().sendPacket(new CPacketPlayer.Rotation(
-							MathHelper.wrapDegrees(player.rotationYaw + 180), -player.rotationPitch, player.onGround));
+					NetUtils.sendPacket(new CPacketPlayer.Rotation(MathHelper.wrapDegrees(player.rotationYaw + 180),
+							-player.rotationPitch, player.onGround));
 				}
 			}
 		});
@@ -54,7 +55,7 @@ public static void registerEvents() {
 			if (packet instanceof CPacketPlayerTryUseItemOnBlock) {
 				if (isSpecialActionKeyPressed()) {
 					EntityPlayerSP player = Minecraft.getMinecraft().player;
-					Minecraft.getMinecraft().getConnection().sendPacket(
+					NetUtils.sendPacket(
 							new CPacketPlayer.Rotation(player.rotationYaw, player.rotationPitch, player.onGround));
 				}
 			}

src/main/java/net/earthcomputer/clientcommands/TempRulesImpl.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import net.earthcomputer.clientcommands.network.NetUtils;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -12,7 +13,6 @@
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Enchantments;
-import net.minecraft.inventory.ClickType;
 import net.minecraft.network.play.client.CPacketPlayerDigging;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
@@ -41,13 +41,7 @@ private static void initToolBreakProtection() {
 		EventManager.addPlayerTickListener(e -> {
 			int hotbarSlot = hotbarSlotToUpdate.getAndSet(-1);
 			if (hotbarSlot != -1) {
-				if (e.player.openContainer == e.player.inventoryContainer) {
-					// Pickup the item and put it back again to refresh durability
-					for (int i = 0; i < 2; i++) {
-						Minecraft.getMinecraft().playerController.windowClick(e.player.openContainer.windowId,
-								hotbarSlot, 0, ClickType.PICKUP, e.player);
-					}
-				}
+				NetUtils.resyncInventory(slot -> slot.inventory == Minecraft.getMinecraft().player.inventory);
 			}
 		});
 		EventManager.addPreDamageItemListener(e -> {
@@ -89,8 +83,8 @@ private static void initGhostBlockFix() {
 			if (!blocksToUpdate.isEmpty()) {
 				for (BlockPos pos : blocksToUpdate) {
 					// Cause the server to re-send the block
-					Minecraft.getMinecraft().getConnection().sendPacket(new CPacketPlayerDigging(
-							CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, pos, EnumFacing.DOWN));
+					NetUtils.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, pos,
+							EnumFacing.DOWN));
 				}
 				blocksToUpdate.clear();
 			}

src/main/java/net/earthcomputer/clientcommands/ToolDamageManager.java

@@ -4,13 +4,13 @@
 import java.util.Iterator;
 import java.util.List;
 
+import net.earthcomputer.clientcommands.network.NetUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockCommandBlock;
 import net.minecraft.block.BlockStructure;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.player.EntityPlayer;
@@ -69,7 +69,7 @@ public static void registerEvents() {
 				ItemStack elytra = player.inventory.armorItemInSlot(2);
 				if (!elytra.isEmpty() && elytra.getItem() == Items.ELYTRA) {
 					if (postToolDamaged(player, elytra, 1)) {
-						((EntityPlayerSP) player).connection.sendPacket(
+						NetUtils.sendPacket(
 								new CPacketEntityAction(player, CPacketEntityAction.Action.START_FALL_FLYING));
 					}
 				}

src/main/java/net/earthcomputer/clientcommands/network/NetUtils.java

@@ -0,0 +1,43 @@
+package net.earthcomputer.clientcommands.network;
+
+import java.util.function.Predicate;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.ClickType;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.client.CPacketClickWindow;
+
+public class NetUtils {
+
+	/**
+	 * Sends a packet to the server
+	 */
+	public static void sendPacket(Packet<?> packet) {
+		Minecraft.getMinecraft().getConnection().sendPacket(packet);
+	}
+
+	/**
+	 * Resyncs the inventory. Effects are not immediate. Returns whether successful
+	 */
+	public static boolean resyncInventory(Predicate<Slot> isDesynced) {
+		EntityPlayer player = Minecraft.getMinecraft().player;
+		Container container = player.openContainer;
+
+		for (Slot slot : container.inventorySlots) {
+			if (!slot.getHasStack() && !isDesynced.test(slot)) {
+				short transactionId = container.getNextTransactionID(player.inventory);
+				sendPacket(new CPacketClickWindow(container.windowId, slot.slotNumber, 0, ClickType.PICKUP,
+						new ItemStack(Blocks.COMMAND_BLOCK, 65), transactionId));
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+}