From a6df4e73dfd1265f77b2119b7eb53791fb4a313a Mon Sep 17 00:00:00 2001
From: lowercasebtw <jejojora2@gmail.com>
Date: Fri, 6 Dec 2024 18:12:43 -0500
Subject: [PATCH] Move some enabled checks

---
 .../eu/midnightdust/swordblocking/SwordBlockingClient.java  | 4 ++--
 .../swordblocking/mixin/MixinBipedEntityModel.java          | 2 +-
 .../swordblocking/mixin/MixinHeldItemRenderer.java          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/common/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
index 4e4225e..4364cb5 100644
--- a/common/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
+++ b/common/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
@@ -17,7 +17,7 @@ public class SwordBlockingClient {
     }
 
     public static boolean isEntityBlocking(LivingEntity entity) {
-        return entity.isUsingItem() && canShieldSwordBlock(entity);
+        return SwordBlockingConfig.enabled && entity.isUsingItem() && canShieldSwordBlock(entity);
     }
 
     public static boolean canShieldSwordBlock(LivingEntity entity) {
@@ -30,7 +30,7 @@ public class SwordBlockingClient {
     }
 
     public static boolean shouldHideShield(LivingEntity entity, ItemStack stack) {
-        return (SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem)
+        return SwordBlockingConfig.enabled && (SwordBlockingConfig.alwaysHideShield && SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem)
                 || (SwordBlockingConfig.hideShield && stack.getItem() instanceof ShieldItem && SwordBlockingClient.canShieldSwordBlock(entity));
     }
 }
diff --git a/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java b/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java
index 968a8d0..aa60de0 100644
--- a/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java
+++ b/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinBipedEntityModel.java
@@ -24,7 +24,7 @@ public abstract class MixinBipedEntityModel<T extends BipedEntityRenderState> {
     @Inject(method = "setAngles(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;animateArms(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;F)V", shift = At.Shift.BEFORE))
     private void swordBlocking$setBlockingAngles(T bipedEntityRenderState, CallbackInfo ci) {
         LivingEntity livingEntity = SwordBlockingClient.RENDER_STATE_TO_ENTITY_MAP.get(bipedEntityRenderState);
-        if (!SwordBlockingConfig.enabled || livingEntity == null || !SwordBlockingClient.isEntityBlocking(livingEntity))
+        if (livingEntity == null || !SwordBlockingClient.isEntityBlocking(livingEntity))
             return;
         if (livingEntity.getOffHandStack().getItem() instanceof ShieldItem)
             this.positionRightArm(bipedEntityRenderState, BipedEntityModel.ArmPose.BLOCK);
diff --git a/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java b/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java
index 645cd28..6d1cc97 100644
--- a/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java
+++ b/common/src/main/java/eu/midnightdust/swordblocking/mixin/MixinHeldItemRenderer.java
@@ -34,7 +34,7 @@ public abstract class MixinHeldItemRenderer {
 
     @Inject(method = "renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At("HEAD"), cancellable = true)
     public void swordBlocking$hideShield(LivingEntity entity, ItemStack stack, ModelTransformationMode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (SwordBlockingConfig.enabled && SwordBlockingClient.shouldHideShield(entity, stack)) {
+        if (SwordBlockingClient.shouldHideShield(entity, stack)) {
             ci.cancel();
         }
     }
@@ -42,7 +42,7 @@ public abstract class MixinHeldItemRenderer {
     @Redirect(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;getActiveHand()Lnet/minecraft/util/Hand;", ordinal = 1))
     private Hand swordBlocking$changeActiveHand(AbstractClientPlayerEntity player, @Local(name = "hand") Hand hand) {
         Hand activeHand = player.getActiveHand();
-        if (SwordBlockingConfig.enabled && SwordBlockingClient.isEntityBlocking(player)) {
+        if (SwordBlockingClient.isEntityBlocking(player)) {
             return swordBlocking$getBlockingHand(activeHand);
         } else {
             return activeHand;
@@ -52,7 +52,7 @@ public abstract class MixinHeldItemRenderer {
     @Redirect(method = "renderFirstPersonItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getUseAction()Lnet/minecraft/item/consume/UseAction;"))
     private UseAction swordBlocking$changeItemAction(ItemStack stack, @Local(argsOnly = true) AbstractClientPlayerEntity player, @Local(name = "hand") Hand hand) {
         UseAction defaultUseAction = stack.getUseAction();
-        if (SwordBlockingConfig.enabled && SwordBlockingClient.isEntityBlocking(player)) {
+        if (SwordBlockingClient.isEntityBlocking(player)) {
             return swordBlocking$getBlockingHand(player.getActiveHand()) == hand ? UseAction.BLOCK : defaultUseAction;
         } else {
             return defaultUseAction;