From cfae3b8ca91484ef7d9dc7e0eff919ffeeff89c7 Mon Sep 17 00:00:00 2001
From: Kevin <92656833+kevinthegreat1@users.noreply.github.com>
Date: Tue, 25 Jul 2023 02:15:16 -0400
Subject: Hide spammed warnings (#209)

---
 .../mixin/ClientPlayNetworkHandlerMixin.java       | 29 +++++++++++++++-------
 .../xmrvizzy/skyblocker/mixin/ScoreboardMixin.java | 16 ++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/me/xmrvizzy/skyblocker/mixin/ScoreboardMixin.java

(limited to 'src/main/java/me/xmrvizzy/skyblocker/mixin')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index 80c98473..1d8b6565 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -1,24 +1,35 @@
 package me.xmrvizzy.skyblocker.mixin;
 
+import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import me.xmrvizzy.skyblocker.skyblock.FishingHelper;
-import net.minecraft.client.MinecraftClient;
+import me.xmrvizzy.skyblocker.utils.Utils;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
-import org.spongepowered.asm.mixin.Final;
+import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public abstract class ClientPlayNetworkHandlerMixin {
-    @Shadow
-    @Final
-    private MinecraftClient client;
-
     @Inject(method = "onPlaySound", at = @At("RETURN"))
-    private void skyblockmod_onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
-        FishingHelper.onSound(client, packet);
+    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
+        FishingHelper.onSound(packet);
+    }
+
+    @WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V"))
+    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"))
+    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"))
+    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
+        return !Utils.isOnHypixel();
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ScoreboardMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ScoreboardMixin.java
new file mode 100644
index 00000000..6f88821c
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ScoreboardMixin.java
@@ -0,0 +1,16 @@
+package me.xmrvizzy.skyblocker.mixin;
+
+import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.minecraft.scoreboard.Scoreboard;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(Scoreboard.class)
+public abstract class ScoreboardMixin {
+    @WrapWithCondition(method = "addTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"))
+    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object arg) {
+        return !Utils.isOnHypixel();
+    }
+}
-- 
cgit