Take mending into account in PlayerRandCracker

Author: Earthcomputer

build.gradle

@@ -25,8 +25,8 @@ dependencies {
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modImplementation 'net.earthcomputer:multiconnect:1.2.7.1:api'
-	include 'net.earthcomputer:multiconnect:1.2.7.1:api'
+	modImplementation 'net.earthcomputer:multiconnect:1.3.8:api'
+	include 'net.earthcomputer:multiconnect:1.3.8:api'
 }
 
 processResources {

src/main/java/net/earthcomputer/clientcommands/features/PlayerRandCracker.java

@@ -2,6 +2,8 @@
 
 import net.earthcomputer.clientcommands.TempRules;
 import net.earthcomputer.clientcommands.command.ClientCommandManager;
+import net.earthcomputer.multiconnect.api.MultiConnectAPI;
+import net.earthcomputer.multiconnect.api.Protocols;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.resource.language.I18n;
@@ -102,7 +104,8 @@ public static void onEntityCramming() {
     }
 
     public static void onDrink() {
-        resetCracker("drink");
+        // TODO: was this ever a thing?
+        //resetCracker("drink");
     }
 
     public static void onEat() {
@@ -126,7 +129,9 @@ public static void onSprinting() {
     }
 
     public static void onEquipmentBreak() {
-        resetCracker("itemBreak");
+        if (MultiConnectAPI.instance().getProtocolVersion() <= Protocols.V1_13_2) {
+            resetCracker("itemBreak");
+        }
     }
 
     public static void onPotionParticles() {
@@ -144,6 +149,10 @@ public static void onAnvilUse() {
             resetCracker("anvil");
     }
 
+    public static void onMending() {
+        resetCracker("mending");
+    }
+
     public static void onFrostWalker() {
         resetCracker("frostWalker");
     }

src/main/java/net/earthcomputer/clientcommands/mixin/MixinClientPlayerEntity.java

@@ -1,14 +1,22 @@
 package net.earthcomputer.clientcommands.mixin;
 
+import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.StringReader;
 import net.earthcomputer.clientcommands.command.ClientCommandManager;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
 import net.earthcomputer.clientcommands.interfaces.IKeyBinding;
 import net.earthcomputer.clientcommands.script.ScriptManager;
+import net.earthcomputer.multiconnect.api.MultiConnectAPI;
+import net.earthcomputer.multiconnect.api.Protocols;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.ExperienceOrbEntity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,10 +25,14 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientPlayerEntity.class)
-public class MixinClientPlayerEntity {
+public class MixinClientPlayerEntity extends AbstractClientPlayerEntity {
 
     @Unique private boolean wasSprintPressed = false;
 
+    public MixinClientPlayerEntity(ClientWorld world, GameProfile profile) {
+        super(world, profile);
+    }
+
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
     private void onSendChatMessage(String message, CallbackInfo ci) {
         if (message.startsWith("/")) {
@@ -38,6 +50,16 @@ private void onSendChatMessage(String message, CallbackInfo ci) {
         }
     }
 
+    @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;tick()V"))
+    private void onTick(CallbackInfo ci) {
+        if (Enchantments.MENDING.getEquipment(this).values().stream()
+                .anyMatch(stack -> stack.isDamaged() || MultiConnectAPI.instance().getProtocolVersion() <= Protocols.V1_15_2)) {
+            if (!world.getEntitiesByClass(ExperienceOrbEntity.class, getBoundingBox(), null).isEmpty()) {
+                PlayerRandCracker.onMending();
+            }
+        }
+    }
+
     @Inject(method = "dropSelectedItem", at = @At("HEAD"))
     public void onDropSelectedItem(boolean dropAll, CallbackInfoReturnable<ItemEntity> ci) {
         PlayerRandCracker.onDropItem();

src/main/java/net/earthcomputer/clientcommands/mixin/MixinLivingEntity.java

@@ -24,6 +24,7 @@
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LivingEntity.class)
@@ -56,7 +57,9 @@ public void onEat(CallbackInfo ci) {
             PlayerRandCracker.onEat();
     }
 
-    @Inject(method = "baseTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"))
+    @Inject(method = "baseTick",
+            slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/tag/FluidTags;WATER:Lnet/minecraft/tag/Tag$Identified;", ordinal = 0)),
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;", ordinal = 0))
     public void onUnderwater(CallbackInfo ci) {
         if (isThePlayer())
             PlayerRandCracker.onUnderwater();