From bd3f0329d0e391bd84b5f9e3ff207d9dd9815853 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Mon, 9 Oct 2023 12:58:02 +0200
Subject: new pr because fixing merge conflict would take too long

---
 .../mixin/ClientPlayNetworkHandlerMixin.java       | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java

(limited to 'src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java')

diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
new file mode 100644
index 00000000..fff534b2
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -0,0 +1,48 @@
+package de.hysky.skyblocker.mixin;
+
+import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.sugar.Local;
+import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
+import dev.cbyrne.betterinject.annotations.Inject;
+import de.hysky.skyblocker.skyblock.FishingHelper;
+import de.hysky.skyblocker.utils.Utils;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(ClientPlayNetworkHandler.class)
+public abstract class ClientPlayNetworkHandlerMixin {
+
+    @Inject(method = "onPlaySound", at = @At("RETURN"))
+    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet) {
+        FishingHelper.onSound(packet);
+    }
+
+    @SuppressWarnings("resource")
+	@ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0))
+    private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity, @Local LivingEntity collector) {
+        DungeonSecrets.onItemPickup(itemEntity, collector, collector == MinecraftClient.getInstance().player);
+        return itemEntity;
+    }
+
+    @WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
+    private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
+        return !Utils.isOnHypixel();
+    }
+
+    @WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg) {
+        return !Utils.isOnHypixel();
+    }
+
+    @WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
+        return !Utils.isOnHypixel();
+    }
+}
-- 
cgit