From ead6762eb1c005914b05f9d3c29f334989c67513 Mon Sep 17 00:00:00 2001
From: nea <nea@nea.moe>
Date: Tue, 16 May 2023 01:23:43 +0200
Subject: Replace references to NEU with Firmament

---
 .../mixins/devenv/DisableCommonPacketWarnings.java | 37 ++++++++++++++++++++++
 .../mixins/devenv/DisableInvalidFishingHook.java   | 15 +++++++++
 .../firmament/mixins/devenv/MixinScoreboard.java   | 15 +++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java
 create mode 100644 src/main/java/moe/nea/firmament/mixins/devenv/DisableInvalidFishingHook.java
 create mode 100644 src/main/java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java

(limited to 'src/main/java/moe/nea/firmament/mixins/devenv')

diff --git a/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java b/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java
new file mode 100644
index 0000000..16ca7c1
--- /dev/null
+++ b/src/main/java/moe/nea/firmament/mixins/devenv/DisableCommonPacketWarnings.java
@@ -0,0 +1,37 @@
+package moe.nea.firmament.mixins.devenv;
+
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.util.Identifier;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+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"))
+    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"))
+    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"))
+    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"))
+    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
new file mode 100644
index 0000000..b1a4049
--- /dev/null
+++ b/src/main/java/moe/nea/firmament/mixins/devenv/DisableInvalidFishingHook.java
@@ -0,0 +1,15 @@
+package moe.nea.firmament.mixins.devenv;
+
+import net.minecraft.entity.projectile.FishingBobberEntity;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+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"))
+    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
new file mode 100644
index 0000000..acb0033
--- /dev/null
+++ b/src/main/java/moe/nea/firmament/mixins/devenv/MixinScoreboard.java
@@ -0,0 +1,15 @@
+package moe.nea.firmament.mixins.devenv;
+
+import net.minecraft.scoreboard.Scoreboard;
+import org.slf4j.Logger;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+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"))
+    public void onExistingteam(Logger instance, String s, Object o) {
+        // Ignore creations of existing teams
+    }
+}
-- 
cgit