fixed blocking rendering of other players

Author: FabiPunktExe

simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/legacypvp/ItemInHandRendererMixin.java

@@ -42,7 +42,7 @@ public void itemUsed(InteractionHand interactionHand, CallbackInfo ci) {
 
     @Inject(at = @At(value = "HEAD"), method = "renderArmWithItem", cancellable = true)
     public void renderArmWithItem(AbstractClientPlayer player, float partialTicks, float pitch, InteractionHand hand, float swingProgress, ItemStack itemStack, float equipProgress, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, CallbackInfo ci) {
-        if (LegacyPvP.ENABLED && LegacyPvP.BLOCKING && player.getUsedItemHand() == hand) {
+        if (LegacyPvP.ENABLED && LegacyPvP.isBlocking(player) && player.getUsedItemHand() == hand) {
             poseStack.pushPose();
             boolean mainHand = hand == InteractionHand.MAIN_HAND;
             HumanoidArm arm = mainHand ? player.getMainArm() : player.getMainArm().getOpposite();

simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/legacypvp/LivingEntityMixin.java

@@ -14,7 +14,6 @@
     "feature.legacypvp.GuiMixin",
     "feature.legacypvp.HumanoidModelMixin",
     "feature.legacypvp.ItemInHandRendererMixin",
-    "feature.legacypvp.LivingEntityMixin",
     "feature.legacypvp.PlayerItemInHandLayerMixin",
     "feature.legacypvp.PlayerMixin",
     "feature.legacypvp.SwordItemMixin",

simpleclient-1.19.4/src/main/resources/simpleclient.mixins.json

@@ -46,7 +46,7 @@ public void itemUsed(InteractionHand interactionHand, CallbackInfo ci) {
 
     @Inject(at = @At(value = "HEAD"), method = "renderArmWithItem", cancellable = true)
     public void renderArmWithItem(AbstractClientPlayer player, float partialTicks, float pitch, InteractionHand hand, float swingProgress, ItemStack itemStack, float equipProgress, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, CallbackInfo ci) {
-        if (LegacyPvP.ENABLED && LegacyPvP.BLOCKING && player.getUsedItemHand() == hand) {
+        if (LegacyPvP.ENABLED && LegacyPvP.isBlocking(player) && player.getUsedItemHand() == hand) {
             poseStack.pushPose();
             boolean mainHand = hand == InteractionHand.MAIN_HAND;
             HumanoidArm arm = mainHand ? player.getMainArm() : player.getMainArm().getOpposite();

simpleclient-1.20.1/src/main/java/simpleclient/mixin/feature/legacypvp/ItemInHandRendererMixin.java

@@ -16,7 +16,6 @@
     "feature.legacypvp.GuiMixin",
     "feature.legacypvp.HumanoidModelMixin",
     "feature.legacypvp.ItemInHandRendererMixin",
-    "feature.legacypvp.LivingEntityMixin",
     "feature.legacypvp.PlayerItemInHandLayerMixin",
     "feature.legacypvp.PlayerMixin",
     "feature.legacypvp.SwordItemMixin",

simpleclient-1.20.1/src/main/java/simpleclient/mixin/feature/legacypvp/LivingEntityMixin.java

@@ -42,7 +42,7 @@ public void itemUsed(InteractionHand interactionHand, CallbackInfo ci) {
 
     @Inject(at = @At(value = "HEAD"), method = "renderArmWithItem", cancellable = true)
     public void renderArmWithItem(AbstractClientPlayer player, float partialTicks, float pitch, InteractionHand hand, float swingProgress, ItemStack itemStack, float equipProgress, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, CallbackInfo ci) {
-        if (LegacyPvP.ENABLED && LegacyPvP.BLOCKING && player.getUsedItemHand() == hand) {
+        if (LegacyPvP.ENABLED && LegacyPvP.isBlocking(player) && player.getUsedItemHand() == hand) {
             poseStack.pushPose();
             boolean mainHand = hand == InteractionHand.MAIN_HAND;
             HumanoidArm arm = mainHand ? player.getMainArm() : player.getMainArm().getOpposite();

simpleclient-1.20.1/src/main/resources/simpleclient.mixins.json

@@ -15,7 +15,6 @@
     "feature.legacypvp.GuiMixin",
     "feature.legacypvp.HumanoidModelMixin",
     "feature.legacypvp.ItemInHandRendererMixin",
-    "feature.legacypvp.LivingEntityMixin",
     "feature.legacypvp.PlayerItemInHandLayerMixin",
     "feature.legacypvp.PlayerMixin",
     "feature.legacypvp.SwordItemMixin",