Replace magic numbers with EntityStatuses

MeteorDevelopment · Jan 24, 2025 · b7a0468 · b7a0468
1 parent 669aaa3
commit b7a0468
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoTotem.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoTotem.java
@@ -16,6 +16,7 @@
 import meteordevelopment.orbit.EventHandler;
 import meteordevelopment.orbit.EventPriority;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.Items;
 import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
@@ -105,7 +106,7 @@ else if (ticks >= delay.get()) {
     @EventHandler(priority = EventPriority.HIGH)
     private void onReceivePacket(PacketEvent.Receive event) {
         if (!(event.packet instanceof EntityStatusS2CPacket p)) return;
-        if (p.getStatus() != 35) return;
+        if (p.getStatus() != EntityStatuses.USE_TOTEM_OF_UNDYING) return;
 
         Entity entity = p.getEntity(mc.world);
         if (entity == null || !(entity.equals(mc.player))) return;

diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/Notifier.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/misc/Notifier.java
@@ -23,6 +23,7 @@
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.thrown.EnderPearlEntity;
@@ -306,7 +307,7 @@ private void onReceivePacket(PacketEvent.Receive event) {
             case PlayerRemoveS2CPacket packet when joinsLeavesMode.get().equals(JoinLeaveModes.Both) || joinsLeavesMode.get().equals(JoinLeaveModes.Leaves) ->
                 createLeaveNotification(packet);
 
-            case EntityStatusS2CPacket packet when totemPops.get() && packet.getStatus() == 35 && packet.getEntity(mc.world) instanceof PlayerEntity entity -> {
+            case EntityStatusS2CPacket packet when totemPops.get() && packet.getStatus() == EntityStatuses.USE_TOTEM_OF_UNDYING && packet.getEntity(mc.world) instanceof PlayerEntity entity -> {
                 if ((entity.equals(mc.player) && totemsIgnoreOwn.get())
                     || (Friends.get().isFriend(entity) && totemsIgnoreOthers.get())
                     || (!Friends.get().isFriend(entity) && totemsIgnoreFriends.get())

diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/PopChams.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/PopChams.java
@@ -17,6 +17,7 @@
 import meteordevelopment.meteorclient.utils.render.color.SettingColor;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
 
@@ -103,7 +104,7 @@ public void onDeactivate() {
     @EventHandler
     private void onReceivePacket(PacketEvent.Receive event) {
         if (!(event.packet instanceof EntityStatusS2CPacket p)) return;
-        if (p.getStatus() != 35) return;
+        if (p.getStatus() != EntityStatuses.USE_TOTEM_OF_UNDYING) return;
 
         Entity entity = p.getEntity(mc.world);
         if (!(entity instanceof PlayerEntity player) || entity == mc.player) return;