feat: implement sword blocking feature with configurable key binding

Author: KdGaming0

CHANGELOG.md

@@ -1,23 +1,3 @@
-Rewrite & New Features
+New Features:
 
-Held Item Customisation
-- Added fully configurable arm base position (X, Y, Z anchor and height bob scale)
-- Added item transform overrides — independently control size, position (X/Y/Z), and rotation (X/Y/Z) of the held item
-- Both arm position and item transform support separate values for main hand and off-hand
-- Master toggle and per-feature sub-toggles for arm position and item transform independently
-
-Swing Animation
-- Added customisable swing arc — control pre-rotation, Y/Z/X arc amounts, and counter-rotation
-- Added customisable swing drift — control X/Y/Z translation during the swing
-- Added swing speed multiplier with optional ignore for Haste/Mining Fatigue effects
-- Added option to disable swing bobbing
-- Added option to disable the swing animation entirely
-
-Entity Scaling
-- Rewrote player and entity scaling to use render state instead of PoseStack transforms,
-  fixing visual glitches and improving performance
-- Added per-tick scale caching to avoid redundant lookups each frame
- 
-Other
-- Added Show Own Nametag in Third Person
-- Optimised mod performance
+feat: add client side sword block when holding right click with a sword

src/main/java/com/github/kd_gaming1/scaleme/ScaleMe.java

@@ -2,38 +2,59 @@
 
 import com.github.kd_gaming1.scaleme.command.Commands;
 import com.github.kd_gaming1.scaleme.config.ScaleMeConfig;
+import com.github.kd_gaming1.scaleme.util.BlockingState;
 import com.github.kd_gaming1.scaleme.util.HypixelLocationState;
 import eu.midnightdust.lib.config.MidnightConfig;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.azureaaron.hmapi.network.HypixelNetworking;
 import net.azureaaron.hmapi.network.packet.v1.s2c.LocationUpdateS2CPacket;
 import net.fabricmc.api.ClientModInitializer;
-
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 //? if >=1.21.11 {
 /*import net.minecraft.util.Util;
-*///?} else {
+ *///?} else {
 import net.minecraft.Util;
 //?}
+import net.minecraft.client.KeyMapping;
+import net.minecraft.tags.ItemTags;
+import org.lwjgl.glfw.GLFW;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ScaleMe implements ClientModInitializer {
+
     public static final String MOD_ID = "scaleme";
     public static final Logger LOGGER = LoggerFactory.getLogger("Scale Me");
 
-
     @Override
     public void onInitializeClient() {
         MidnightConfig.init(MOD_ID, ScaleMeConfig.class);
 
-        HypixelNetworking.registerToEvents(Util.make(new Object2IntOpenHashMap<>(), map -> map.put(LocationUpdateS2CPacket.ID, 1)));
+        HypixelNetworking.registerToEvents(
+                Util.make(new Object2IntOpenHashMap<>(), map -> map.put(LocationUpdateS2CPacket.ID, 1))
+        );
 
         HypixelLocationState.register();
 
-        ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> HypixelLocationState.reset());
+        ClientPlayConnectionEvents.DISCONNECT.register(
+                (handler, client) -> HypixelLocationState.reset()
+        );
+
+        KeyMapping blockKey = KeyBindingHelper.registerKeyBinding(new KeyMapping(
+                "key.scaleme.sword_block",
+                GLFW.GLFW_MOUSE_BUTTON_RIGHT,
+                KeyMapping.Category.GAMEPLAY
+        ));
+
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            if (client.player == null) return;
+            BlockingState.isBlocking = ScaleMeConfig.enableSwordBlock
+                    && blockKey.isDown()
+                    && client.player.getMainHandItem().is(ItemTags.SWORDS);
+        });
 
-        // Register commands
         Commands.register();
     }
 }

src/main/java/com/github/kd_gaming1/scaleme/config/ScaleMeConfig.java

@@ -136,6 +136,9 @@ public class ScaleMeConfig extends MidnightConfig {
     @Entry(category = ANIM)
     public static boolean enableAnimOverrides = false;
 
+    @Entry(category = ANIM)
+    public static boolean enableSwordBlock = false;
+
     @Entry(category = ANIM)
     public static boolean disableSwingBobbing = false;
 

src/main/java/com/github/kd_gaming1/scaleme/mixin/ItemInHandRendererMixin.java

@@ -1,6 +1,7 @@
 package com.github.kd_gaming1.scaleme.mixin;
 
 import com.github.kd_gaming1.scaleme.config.ScaleMeConfig;
+import com.github.kd_gaming1.scaleme.util.BlockingState;
 import com.github.kd_gaming1.scaleme.util.HandContext;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
@@ -10,13 +11,16 @@
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
 import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.util.Mth;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -25,6 +29,7 @@
 @Mixin(ItemInHandRenderer.class)
 public class ItemInHandRendererMixin {
 
+    @Unique
     private static final float PI = (float) Math.PI;
 
     @Shadow private void applyItemArmTransform(PoseStack poseStack, HumanoidArm arm, float inverseArmHeight) {}
@@ -165,4 +170,47 @@ public class ItemInHandRendererMixin {
 
         poseStack.translate(invert * baseX, baseY + inverseArmHeight * heightScale, baseZ);
     }
+
+    /** Applies a blocking pose when holding a sword and right-clicking. */
+    @Inject(method = "renderArmWithItem", at = @At("HEAD"), cancellable = true)
+    private void scaleme$applySwordBlockPose(
+            AbstractClientPlayer player,
+            float tickDelta, float pitch,
+            InteractionHand hand,
+            float swingProgress,
+            ItemStack heldItem,
+            float equipProgress,
+            PoseStack poseStack,
+            SubmitNodeCollector collector,
+            int packedLight,
+            CallbackInfo ci) {
+
+        if (!BlockingState.isBlocking || hand != InteractionHand.MAIN_HAND || !heldItem.is(ItemTags.SWORDS)) return;
+        ci.cancel();
+
+        poseStack.pushPose();
+
+        HumanoidArm arm = player.getMainArm();
+        int armSideSign = (arm == HumanoidArm.RIGHT) ? 1 : -1;
+
+        applyItemArmTransform(poseStack, arm, equipProgress);
+        poseStack.translate((float) armSideSign * -0.14142136F, 0.08F, 0.14142136F);
+        poseStack.mulPose(Axis.XP.rotationDegrees(-102.25F));
+        poseStack.mulPose(Axis.YP.rotationDegrees((float) armSideSign * 13.365F));
+        poseStack.mulPose(Axis.ZP.rotationDegrees((float) armSideSign * 78.05F));
+
+        // Self-cast required: Mixin class can't directly extend ItemInHandRenderer
+        ((ItemInHandRenderer) (Object) this).renderItem(
+                player,
+                heldItem,
+                arm == HumanoidArm.RIGHT
+                        ? ItemDisplayContext.FIRST_PERSON_RIGHT_HAND
+                        : ItemDisplayContext.FIRST_PERSON_LEFT_HAND,
+                poseStack,
+                collector,
+                packedLight
+        );
+
+        poseStack.popPose();
+    }
 }

src/main/java/com/github/kd_gaming1/scaleme/util/BlockingState.java

@@ -0,0 +1,8 @@
+package com.github.kd_gaming1.scaleme.util;
+
+/** Shared state indicating whether the player is currently in a sword-block pose. */
+public final class BlockingState {
+    public static boolean isBlocking = false;
+
+    private BlockingState() {}
+}

src/main/resources/assets/minecraft/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+  "key.scaleme.sword_block": "Sword Block"
+}

src/main/resources/assets/scaleme/lang/en_us.json

@@ -96,6 +96,9 @@
 
   "scaleme.midnightconfig.animDesc": "Master switch for all animation customisation. Swing speed, shape, and bobbing are all controlled by this toggle.",
 
+  "scaleme.midnightconfig.enableSwordBlock": "Enable Sword Block  [does not requires Animation Master]",
+  "scaleme.midnightconfig.enableSwordBlock.tooltip": "Lets you hold right-click with a sword to enter a blocking pose, similar to pre-1.9.\nThe keybind defaults to right mouse button — rebind it in Controls if needed.",
+
   "scaleme.midnightconfig.enableAnimOverrides": "Enable Animation Changes  [MASTER]",
   "scaleme.midnightconfig.enableAnimOverrides.tooltip": "Turns on all custom animation settings below. Disable this to keep the default Minecraft swing animations entirely.\n\nControls:\n• Swing bobbing suppression\n• Swing speed and speed effect ignoring\n• Disable swing animation entirely\n• Custom Swing Shape (arc and drift sliders)",