From 13f2b320c34abff8cbe1daa196a2e5e8f3f79188 Mon Sep 17 00:00:00 2001
From: nea <nea@nea.moe>
Date: Thu, 18 May 2023 00:47:24 +0200
Subject: Don't remap logging functions

---
 .../nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java  | 8 ++++----
 .../nea/firmament/mixins/devenv/DisableInvalidFishingHook.java    | 2 +-
 .../java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java b/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java
index 16ca7c1..f507a37 100644
--- a/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java
+++ b/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java
@@ -12,24 +12,24 @@ import java.util.Objects;
 @Mixin(ClientPlayNetworkHandler.class)
 public class DisableCommonPacketWarnings {
 
-    @Redirect(method = "onCustomPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"))
+    @Redirect(method = "onCustomPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
     public void onCustomPacket(Logger instance, String s, Object o) {
         if (!Objects.equals(o, Identifier.of("badlion", "mods"))) {
             instance.warn(s, o);
         }
     }
 
-    @Redirect(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V"))
+    @Redirect(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
     public void onUnknownPassenger(Logger instance, String s) {
         // Ignore passenger data for unknown entities, since HyPixel just sends a lot of those.
     }
 
-    @Redirect(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V"))
+    @Redirect(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
     public void onOnTeam(Logger instance, String s, Object[] objects) {
         // Ignore data for unknown teams, since HyPixel just sends a lot of invalid team data.
     }
 
-    @Redirect(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"))
+    @Redirect(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
     public void onOnPlayerList(Logger instance, String s, Object o) {
         // Ignore invalid player info, since HyPixel just sends a lot of invalid player info
     }
diff --git a/src/main/java/moe/nea/firmament/mixins/devenv/DisableInvalidFishingHook.java b/src/main/java/moe/nea/firmament/mixins/devenv/DisableInvalidFishingHook.java
index b1a4049..6ed7a40 100644
--- a/src/main/java/moe/nea/firmament/mixins/devenv/DisableInvalidFishingHook.java
+++ b/src/main/java/moe/nea/firmament/mixins/devenv/DisableInvalidFishingHook.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(FishingBobberEntity.class)
 public class DisableInvalidFishingHook {
-    @Redirect(method = "onSpawnPacket", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"))
+    @Redirect(method = "onSpawnPacket", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
     public void onOnSpawnPacket(Logger instance, String s, Object o, Object o1) {
         // Don't warn for broken fishing hooks, since HyPixel sends a bunch of those
     }
diff --git a/src/main/java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java b/src/main/java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java
index acb0033..1d421d9 100644
--- a/src/main/java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java
+++ b/src/main/java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Scoreboard.class)
 public class MixinScoreboard {
-    @Redirect(method = "addTeam", at=@At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"))
+    @Redirect(method = "addTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
     public void onExistingteam(Logger instance, String s, Object o) {
         // Ignore creations of existing teams
     }
-- 
cgit