Motschen/SwordBlocking
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/SwordBlocking.git synced 2025-12-15 14:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Mace as a blockable weapon & cleanup canWeaponBlock method.

Browse Source
This commit is contained in:
lowercasebtw
2024-06-13 13:17:47 -04:00
parent 7e2ef4d2d8
commit 35987af8c7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
View File

@@ -3,9 +3,7 @@ package eu.midnightdust.swordblocking;
import eu.midnightdust.swordblocking.config.SwordBlockingConfig; import eu.midnightdust.swordblocking.config.SwordBlockingConfig;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.item.AxeItem; import net.minecraft.item.*;
import net.minecraft.item.ShieldItem;
import net.minecraft.item.SwordItem;
public class SwordBlockingClient implements ClientModInitializer { public class SwordBlockingClient implements ClientModInitializer {
@Override @Override
@@ -14,13 +12,15 @@ public class SwordBlockingClient implements ClientModInitializer {
} }
public static boolean isWeaponBlocking(LivingEntity entity) { public static boolean isWeaponBlocking(LivingEntity entity) {
return (entity.isUsingItem() && canWeaponBlock(entity)); return entity.isUsingItem() && canWeaponBlock(entity);
} }
public static boolean canWeaponBlock(LivingEntity entity) { public static boolean canWeaponBlock(LivingEntity entity) {
return (SwordBlockingConfig.enabled && (entity.getMainHandStack().getItem() instanceof SwordItem || entity.getMainHandStack().getItem() instanceof AxeItem) && if (!SwordBlockingConfig.enabled)
entity.getOffHandStack().getItem() instanceof ShieldItem) || return false;
((entity.getOffHandStack().getItem() instanceof SwordItem || entity.getOffHandStack().getItem() instanceof AxeItem) && Item mainItem = entity.getMainHandStack().getItem();
entity.getMainHandStack().getItem() instanceof ShieldItem); 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);
} }
} }