Remove No Ranged Blocking

No longer needed because it is now implemented in Balkon's WeaponMod: Legacy 1.23.0.

Author: IcarussOne

src/main/java/mod/icarus/balkonsexpansion/BEConfig.java

@@ -49,11 +49,6 @@ public static class GeneralSettings {
         @Config.Comment("Enables extra blocking sounds for battleaxes and katanas [default: true]")
         @Config.RequiresMcRestart
         public boolean MELEE_BLOCKING_SOUNDS = true;
-
-        @Config.Name("No Ranged Blocking")
-        @Config.Comment("Disables blocking when reloading ranged weapons or preparing boomerangs because this is mainly unintentional behavior [default: true]")
-        @Config.RequiresMcRestart
-        public boolean NO_RANGED_BLOCKING = true;
     }
 
     public static class ModIntegrationSettings {

src/main/java/mod/icarus/balkonsexpansion/event/BEEvents.java

@@ -2,12 +2,10 @@
 
 import ckathode.weaponmod.item.IItemWeapon;
 import ckathode.weaponmod.item.ItemMelee;
-import ckathode.weaponmod.item.ItemShooter;
 import ckathode.weaponmod.item.MeleeCompBoomerang;
 import ckathode.weaponmod.item.MeleeComponent;
 import mod.icarus.balkonsexpansion.BEConfig;
 import mod.icarus.balkonsexpansion.BalkonsExpansion;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.Item;
@@ -16,7 +14,6 @@
 import net.minecraft.util.SoundCategory;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 @Mod.EventBusSubscriber(modid = BalkonsExpansion.MOD_ID)
@@ -43,27 +40,4 @@ public static void onBlockMelee(LivingAttackEvent event) {
             }
         }
     }
-
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public static void onBlockRanged(LivingAttackEvent event) {
-        EntityLivingBase entity = event.getEntityLiving();
-
-        if (entity instanceof EntityPlayer) {
-            EntityPlayer player = (EntityPlayer) entity;
-            ItemStack stack = player.getActiveItemStack();
-            Item item = stack.getItem();
-
-            // Skips unwanted items and null values to prevent crashes.
-            if (!(item instanceof IItemWeapon)) return;
-
-            MeleeComponent meleeComp = ((IItemWeapon) stack.getItem()).getMeleeComponent();
-
-            // Disables blocking with ranged weapons because this is mainly unintentional behavior.
-            if (item instanceof ItemShooter || item instanceof ItemMelee && meleeComp instanceof MeleeCompBoomerang) {
-                if (BEConfig.general_settings.NO_RANGED_BLOCKING) {
-                    player.resetActiveHand();
-                }
-            }
-        }
-    }
 }