new pr because fixing merge conflict would take too long

1 files changed, 35 insertions, 0 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java
new file mode 100644
index 00000000..37ae92e8
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java
@@ -0,0 +1,35 @@
+package de.hysky.skyblocker.mixin;
+
+import com.mojang.authlib.GameProfile;
+
+import dev.cbyrne.betterinject.annotations.Inject;
+import de.hysky.skyblocker.skyblock.HotbarSlotLock;
+import de.hysky.skyblocker.skyblock.item.ItemProtection;
+import de.hysky.skyblocker.skyblock.rift.HealingMelonIndicator;
+import de.hysky.skyblocker.utils.Utils;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ClientPlayerEntity.class)
+public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
+    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
+        super(world, profile);
+    }
+
+    @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)
+    public void skyblocker$dropSelectedItem(CallbackInfoReturnable<Boolean> cir) {
+        if (Utils.isOnSkyblock()) {
+            if (ItemProtection.isItemProtected(this.getInventory().getMainHandStack())) cir.setReturnValue(false);
+            HotbarSlotLock.handleDropSelectedItem(this.getInventory().selectedSlot, cir);
+        }
+    }
+
+    @Inject(method = "updateHealth", at = @At("RETURN"))
+    public void skyblocker$updateHealth() {
+        HealingMelonIndicator.updateHealth();
+    }
+}
\ No newline at end of file