Refactor ClientPlayNetworkHandlerMixin

2 files changed, 113 insertions, 114 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 62e5ed90..358a6635 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -55,47 +55,47 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public QuickNavItem button3 = new QuickNavItem(true, new ItemData("bone"), "Pets(:? \\(\\d+\\/\\d+\\))?", "/pets");
 
-        /* REGEX Explanation
-         * "Wardrobe" : simple match on letters
-         * " \\([12]\\/2\\)" : match on the page either " (1/2)" or " (2/2)"
-         */
-        @SerialEntry
-        public QuickNavItem button4 = new QuickNavItem(true,
-                new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe \\([12]/2\\)",
-                "/wardrobe");
-
-        @SerialEntry
-        public QuickNavItem button5 = new QuickNavItem(true, new ItemData("player_head", 1,
-                "tag:{SkullOwner:{Id:[I;-2081424676,-57521078,-2073572414,158072763],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTU5MTMxMDU4NTYwOSwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODBhMDc3ZTI0OGQxNDI3NzJlYTgwMDg2NGY4YzU3OGI5ZDM2ODg1YjI5ZGFmODM2YjY0YTcwNjg4MmI2ZWMxMCIKICAgIH0KICB9Cn0=\"}]}}}"),
-                "Sack of Sacks", "/sacks");
-
-        /* REGEX Explanation
-         * "(?:Rift )?" : optional match on the non-capturing group "Rift "
-         * "Storage" : simple match on letters
-         * "(?: \\([12]\\/2\\))?" : optional match on the non-capturing group " (1/2)" or " (2/2)"
-         */
-        @SerialEntry
-        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),
-                "(?:Rift )?Storage(?: \\(1/2\\))?", "/storage");
-
-        @SerialEntry
-        public QuickNavItem button7 = new QuickNavItem(true, new ItemData("player_head", 1,
-                "tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}"),
-                "none", "/hub");
-
-        @SerialEntry
-        public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1,
-                "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"),
-                "none", "/warp dungeon_hub");
-
-        @SerialEntry
-        public QuickNavItem button9 = new QuickNavItem(true, new ItemData("player_head", 1,
-                "tag:{SkullOwner:{Id:[I;-562285948,532499670,-1705302742,775653035],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjVkZjU1NTkyNjQzMGQ1ZDc1YWRlZDIxZGQ5NjE5Yjc2YzViN2NhMmM3ZjU0MDE0NDA1MjNkNTNhOGJjZmFhYiJ9fX0=\"}]}}}"),
-                "Visit prtl", "/visit prtl");
-
-        @SerialEntry
-        public QuickNavItem button10 = new QuickNavItem(true, new ItemData("enchanting_table"), "Enchant Item",
-                "/etable");
+		/* REGEX Explanation
+		 * "Wardrobe" : simple match on letters
+		 * " \\([12]\\/2\\)" : match on the page either " (1/2)" or " (2/2)"
+		 */
+		@SerialEntry
+		public QuickNavItem button4 = new QuickNavItem(true,
+				new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe \\([12]/2\\)",
+				"/wardrobe");
+
+		@SerialEntry
+		public QuickNavItem button5 = new QuickNavItem(true, new ItemData("player_head", 1,
+				"tag:{SkullOwner:{Id:[I;-2081424676,-57521078,-2073572414,158072763],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTU5MTMxMDU4NTYwOSwKICAicHJvZmlsZUlkIiA6ICI0MWQzYWJjMmQ3NDk0MDBjOTA5MGQ1NDM0ZDAzODMxYiIsCiAgInByb2ZpbGVOYW1lIiA6ICJNZWdha2xvb24iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODBhMDc3ZTI0OGQxNDI3NzJlYTgwMDg2NGY4YzU3OGI5ZDM2ODg1YjI5ZGFmODM2YjY0YTcwNjg4MmI2ZWMxMCIKICAgIH0KICB9Cn0=\"}]}}}"),
+				"Sack of Sacks", "/sacks");
+
+		/* REGEX Explanation
+		 * "(?:Rift )?" : optional match on the non-capturing group "Rift "
+		 * "Storage" : simple match on letters
+		 * "(?: \\([12]\\/2\\))?" : optional match on the non-capturing group " (1/2)" or " (2/2)"
+		 */
+		@SerialEntry
+		public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),
+				"(?:Rift )?Storage(?: \\(1/2\\))?", "/storage");
+
+		@SerialEntry
+		public QuickNavItem button7 = new QuickNavItem(true, new ItemData("player_head", 1,
+				"tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}"),
+				"none", "/hub");
+
+		@SerialEntry
+		public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1,
+				"tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"),
+				"none", "/warp dungeon_hub");
+
+		@SerialEntry
+		public QuickNavItem button9 = new QuickNavItem(true, new ItemData("player_head", 1,
+				"tag:{SkullOwner:{Id:[I;-562285948,532499670,-1705302742,775653035],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjVkZjU1NTkyNjQzMGQ1ZDc1YWRlZDIxZGQ5NjE5Yjc2YzViN2NhMmM3ZjU0MDE0NDA1MjNkNTNhOGJjZmFhYiJ9fX0=\"}]}}}"),
+				"Visit prtl", "/visit prtl");
+
+		@SerialEntry
+		public QuickNavItem button10 = new QuickNavItem(true, new ItemData("enchanting_table"), "Enchant Item",
+				"/etable");
 
 
 		@SerialEntry
@@ -156,11 +156,11 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public boolean acceptReparty = true;
 
-        @SerialEntry
-        public boolean betterPartyFinder = true;
+		@SerialEntry
+		public boolean betterPartyFinder = true;
 
-        @SerialEntry
-        public boolean backpackPreviewWithoutShift = false;
+		@SerialEntry
+		public boolean backpackPreviewWithoutShift = false;
 
 		@SerialEntry
 		public boolean compactorDeletorPreview = true;
@@ -533,9 +533,9 @@ public class SkyblockerConfig {
 		public float itemRarityBackgroundsOpacity = 1f;
 	}
 
-    public enum RarityBackgroundStyle {
-        CIRCULAR(new Identifier(SkyblockerMod.NAMESPACE, "item_rarity_background_circular")),
-        SQUARE(new Identifier(SkyblockerMod.NAMESPACE, "item_rarity_background_square"));
+	public enum RarityBackgroundStyle {
+		CIRCULAR(new Identifier(SkyblockerMod.NAMESPACE, "item_rarity_background_circular")),
+		SQUARE(new Identifier(SkyblockerMod.NAMESPACE, "item_rarity_background_square"));
 
 		public final Identifier tex;
 
@@ -606,11 +606,11 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public DungeonChestProfit dungeonChestProfit = new DungeonChestProfit();
 
-        @SerialEntry
-        public MimicMessage mimicMessage = new MimicMessage();
+		@SerialEntry
+		public MimicMessage mimicMessage = new MimicMessage();
 
-        @SerialEntry
-        public boolean croesusHelper = true;
+		@SerialEntry
+		public boolean croesusHelper = true;
 
 		@SerialEntry
 		public boolean enableMap = true;
@@ -654,11 +654,11 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public boolean floor3GuardianHealthDisplay = true;
 
-        @SerialEntry
-        public boolean allowDroppingProtectedItems = false;
+		@SerialEntry
+		public boolean allowDroppingProtectedItems = false;
 
-        @SerialEntry
-        public LividColor lividColor = new LividColor();
+		@SerialEntry
+		public LividColor lividColor = new LividColor();
 
 		@SerialEntry
 		public Terminals terminals = new Terminals();
@@ -721,10 +721,10 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public Type doorHighlightType = Type.OUTLINED_HIGHLIGHT;
 
-        public enum Type {
-            HIGHLIGHT,
-            OUTLINED_HIGHLIGHT,
-            OUTLINE;
+		public enum Type {
+			HIGHLIGHT,
+			OUTLINED_HIGHLIGHT,
+			OUTLINE;
 
 			@Override
 			public String toString() {
@@ -759,21 +759,21 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public boolean enableDungeonScore300Sound = true;
 
-        @SerialEntry
-        public String dungeonScore300Message = "300 Score Reached!";
+		@SerialEntry
+		public String dungeonScore300Message = "300 Score Reached!";
 
-        @SerialEntry
-        public boolean enableScoreHUD = true;
+		@SerialEntry
+		public boolean enableScoreHUD = true;
 
-        @SerialEntry
-        public int scoreX = 29;
+		@SerialEntry
+		public int scoreX = 29;
 
-        @SerialEntry
-        public int scoreY = 134;
+		@SerialEntry
+		public int scoreY = 134;
 
-        @SerialEntry
-        public float scoreScaling = 1f;
-    }
+		@SerialEntry
+		public float scoreScaling = 1f;
+	}
 
 	public static class DungeonChestProfit {
 		@SerialEntry
@@ -801,17 +801,17 @@ public class SkyblockerConfig {
 		public Formatting incompleteColor = Formatting.BLUE;
 	}
 
-    public static class MimicMessage {
-        @SerialEntry
-        public boolean sendMimicMessage = true;
+	public static class MimicMessage {
+		@SerialEntry
+		public boolean sendMimicMessage = true;
 
-        @SerialEntry
-        public String mimicMessage = "Mimic dead!";
-    }
+		@SerialEntry
+		public String mimicMessage = "Mimic dead!";
+	}
 
-    public static class LividColor {
-        @SerialEntry
-        public boolean enableLividColorGlow = true;
+	public static class LividColor {
+		@SerialEntry
+		public boolean enableLividColorGlow = true;
 
 		@SerialEntry
 		public boolean enableLividColorText = true;
@@ -1004,15 +1004,15 @@ public class SkyblockerConfig {
 		@SerialEntry
 		public ChatFilterResult hideToggleSkyMall = ChatFilterResult.PASS;
 
-        @SerialEntry
-        public ChatFilterResult hideMimicKill = ChatFilterResult.PASS;
+		@SerialEntry
+		public ChatFilterResult hideMimicKill = ChatFilterResult.PASS;
 
-        @SerialEntry
-        public ChatFilterResult hideDeath = ChatFilterResult.PASS;
+		@SerialEntry
+		public ChatFilterResult hideDeath = ChatFilterResult.PASS;
 
-        @SerialEntry
-        public boolean hideMana = false;
-    }
+		@SerialEntry
+		public boolean hideMana = false;
+	}
 
 	public enum Info {
 		PURSE, BITS, LOCATION;
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index e1a28262..1f56fe34 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -17,8 +17,8 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
 import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
 import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
 import net.minecraft.util.Identifier;
@@ -31,10 +31,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public abstract class ClientPlayNetworkHandlerMixin {
-
-    @Inject(method = "onPlaySound", at = @At("RETURN"))
-    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
-        FishingHelper.onSound(packet);
+    @Inject(method = "onBlockUpdate", at = @At("RETURN"))
+    private void skyblocker$onBlockUpdate(BlockUpdateS2CPacket packet, CallbackInfo ci) {
+        if (Utils.isInTheEnd() && SlayerUtils.isInSlayer()) {
+            BeaconHighlighter.beaconPositions.remove(packet.getPos());
+            if (packet.getState().isOf(Blocks.BEACON)) {
+                BeaconHighlighter.beaconPositions.add(packet.getPos());
+            }
+        }
     }
 
     @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0))
@@ -48,14 +52,25 @@ public abstract class ClientPlayNetworkHandlerMixin {
         return !Utils.isOnHypixel();
     }
 
+    @ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
+    private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
+        if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES) DungeonScore.handleEntityDeath(entity);
+        return entity;
+    }
+
     @WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
     private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
         return !Utils.isOnHypixel();
     }
 
-    @WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
-        return !Utils.isOnHypixel();
+    @Inject(method = "onPlaySound", at = @At("RETURN"))
+    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
+        FishingHelper.onSound(packet);
+    }
+
+    @WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
+        return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
     }
 
     @WrapWithCondition(method = { "onScoreboardScoreUpdate", "onScoreboardScoreReset" }, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
@@ -63,29 +78,13 @@ public abstract class ClientPlayNetworkHandlerMixin {
         return !Utils.isOnHypixel();
     }
 
-    @WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-    private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
-        return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
+    @WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
+        return !Utils.isOnHypixel();
     }
 
     @Inject(method = "onParticle", at = @At("RETURN"))
     private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
         MythologicalRitual.onParticle(packet);
     }
-
-    @ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
-    private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
-        if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES)
-            DungeonScore.handleEntityDeath(entity);
-        return entity;
-    }
-    @Inject(method = "onBlockUpdate", at = @At("RETURN"))
-    private void skyblocker$onBlockUpdate(BlockUpdateS2CPacket packet, CallbackInfo ci) {
-        if (Utils.isInTheEnd() && SlayerUtils.isInSlayer()) {
-            BeaconHighlighter.beaconPositions.remove(packet.getPos());
-            if (packet.getState().isOf(Blocks.BEACON)) {
-                BeaconHighlighter.beaconPositions.add(packet.getPos());
-            }
-        }
-    }
 }