From 35987af8c7385902da6b12113d88b4e14eec20e4 Mon Sep 17 00:00:00 2001 From: lowercasebtw Date: Thu, 13 Jun 2024 13:17:47 -0400 Subject: [PATCH] Add Mace as a blockable weapon & cleanup canWeaponBlock method. --- .../swordblocking/SwordBlockingClient.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java index 17787cb..1e8ecca 100644 --- a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java +++ b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java @@ -3,9 +3,7 @@ package eu.midnightdust.swordblocking; import eu.midnightdust.swordblocking.config.SwordBlockingConfig; import net.fabricmc.api.ClientModInitializer; import net.minecraft.entity.LivingEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.ShieldItem; -import net.minecraft.item.SwordItem; +import net.minecraft.item.*; public class SwordBlockingClient implements ClientModInitializer { @Override @@ -14,13 +12,15 @@ public class SwordBlockingClient implements ClientModInitializer { } public static boolean isWeaponBlocking(LivingEntity entity) { - return (entity.isUsingItem() && canWeaponBlock(entity)); + return entity.isUsingItem() && canWeaponBlock(entity); } public static boolean canWeaponBlock(LivingEntity entity) { - return (SwordBlockingConfig.enabled && (entity.getMainHandStack().getItem() instanceof SwordItem || entity.getMainHandStack().getItem() instanceof AxeItem) && - entity.getOffHandStack().getItem() instanceof ShieldItem) || - ((entity.getOffHandStack().getItem() instanceof SwordItem || entity.getOffHandStack().getItem() instanceof AxeItem) && - entity.getMainHandStack().getItem() instanceof ShieldItem); + if (!SwordBlockingConfig.enabled) + return false; + Item mainItem = entity.getMainHandStack().getItem(); + Item offItem = entity.getOffHandStack().getItem(); + return ((mainItem instanceof SwordItem || mainItem instanceof AxeItem || mainItem instanceof MaceItem) && offItem instanceof ShieldItem) + || ((offItem instanceof SwordItem || offItem instanceof AxeItem || offItem instanceof MaceItem) && mainItem instanceof ShieldItem); } }