Fix for ClassCastException and damaging items client-side too early

Author: Earthcomputer

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

@@ -283,7 +283,7 @@ public static void addPlayerTickListener(Listener<PlayerTickEvent> listener) {
 
 	@SubscribeEvent
 	public void onPlayerTick(PlayerTickEvent e) {
-		if (e.side == Side.CLIENT && e.phase == TickEvent.Phase.END) {
+		if (e.player == Minecraft.getMinecraft().player && e.phase == TickEvent.Phase.END) {
 			playerTickListeners.invoke(e);
 		}
 	}

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

@@ -1,5 +1,7 @@
 package net.earthcomputer.clientcommands;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -24,27 +26,27 @@ private static void initBlockReachDistance() {
 		});
 	}
 
+	private static AtomicInteger hotbarSlotToUpdate = new AtomicInteger(-1);
+
 	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);
+					}
+				}
+			}
+		});
 		EventManager.addPreDamageItemListener(e -> {
 			if (TempRules.TOOL_BREAK_PROTECTION.getValue()) {
 				if (e.getItemStack().getItemDamage() + e.getDamageAmount() > e.getItemStack().getMaxDamage()) {
 					e.setCanceled(true);
 					Minecraft.getMinecraft().ingameGUI
 							.setOverlayMessage(I18n.format("tempRules.toolBreakProtection.protected"), false);
-				} else {
-					// Fix client-server desync
-					e.getItemStack().setItemDamage(e.getItemStack().getItemDamage() + e.getDamageAmount());
-					if (EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, e.getItemStack()) > 0) {
-						if (e.getEntityPlayer().openContainer == e.getEntityPlayer().inventoryContainer) {
-							// Pickup the item and put it back again to refresh durability
-							for (int i = 0; i < 2; i++) {
-								Minecraft.getMinecraft().playerController.windowClick(
-										e.getEntityPlayer().openContainer.windowId,
-										e.getEntityPlayer().inventory.currentItem, 0, ClickType.PICKUP,
-										e.getEntityPlayer());
-							}
-						}
-					}
 				}
 			}
 		});
@@ -53,15 +55,7 @@ private static void initToolBreakProtection() {
 				// fix client-server desync
 				e.getItemStack().setItemDamage(e.getItemStack().getItemDamage() + e.getDamageAmount());
 				if (EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, e.getItemStack()) > 0) {
-					if (e.getEntityPlayer().openContainer == e.getEntityPlayer().inventoryContainer) {
-						// Pickup the item and put it back again to refresh durability
-						for (int i = 0; i < 2; i++) {
-							Minecraft.getMinecraft().playerController.windowClick(
-									e.getEntityPlayer().openContainer.windowId,
-									e.getEntityPlayer().inventory.currentItem, 0, ClickType.PICKUP,
-									e.getEntityPlayer());
-						}
-					}
+					hotbarSlotToUpdate.set(e.getEntityPlayer().inventory.currentItem);
 				}
 			}
 		});