Hide spammed warnings (#209)

4 files changed, 39 insertions, 11 deletions

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();
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java
index 8dee3fcb..b53157c5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java
@@ -44,10 +44,10 @@ public class FishingHelper {
         startTime = 0;
     }
 
-    public static void onSound(MinecraftClient client, PlaySoundS2CPacket packet) {
+    public static void onSound(PlaySoundS2CPacket packet) {
         String path = packet.getSound().value().getId().getPath();
         if (SkyblockerConfig.get().general.fishing.enableFishingHelper && startTime != 0 && System.currentTimeMillis() >= startTime + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) {
-            ClientPlayerEntity player = client.player;
+            ClientPlayerEntity player = MinecraftClient.getInstance().player;
             if (player != null && player.fishHook != null) {
                 Vec3d soundToFishHook = player.fishHook.getPos().subtract(packet.getX(), 0, packet.getZ());
                 if (Math.abs(normalYawVector.x * soundToFishHook.z - normalYawVector.z * soundToFishHook.x) < 0.2D && Math.abs(normalYawVector.dotProduct(soundToFishHook)) < 4D && player.getPos().squaredDistanceTo(packet.getX(), packet.getY(), packet.getZ()) > 1D) {
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 701d54e5..83861112 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -18,6 +18,7 @@
     "PlayerListHudAccessor",
     "PlayerListHudMixin",
     "RecipeBookWidgetAccessor",
+    "ScoreboardMixin",
     "accessor.BeaconBlockEntityRendererInvoker",
     "accessor.FrustumInvoker"
   ],