feat: update mod version to 3.0.0 and change release type to STABLE; enhance sword block feature and fix NPC scaling

Author: KdGaming0

CHANGELOG.md

@@ -1,3 +1,4 @@
 New Features:
 
-feat: add client side sword block when holding right click with a sword
+feat: Add client-side sword block when holding right-click with a sword
+fix: Hypixel NPC scaling when chasing the other player scale slider.

build.gradle.kts

@@ -110,7 +110,7 @@ publishMods {
     displayName = "${property("mod.name")} ${property("mod.version")} for ${stonecutter.current.version}"
     version = property("mod.version") as String
     changelog = rootProject.file("CHANGELOG.md").readText()
-    type = BETA
+    type = STABLE
     modLoaders.add("fabric")
 
     dryRun = providers.environmentVariable("MODRINTH_TOKEN").getOrNull() == null

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=false
 
 # Mod properties
-mod.version=3.0.0-beta.1
+mod.version=3.0.0
 mod.group=com.github.kd_gaming1
 mod.id=scaleme
 mod.name=Scale Me

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

@@ -17,6 +17,7 @@
  *///?} else {
 import net.minecraft.Util;
 //?}
+import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.tags.ItemTags;
 import org.lwjgl.glfw.GLFW;
@@ -44,6 +45,7 @@ public void onInitializeClient() {
 
         KeyMapping blockKey = KeyBindingHelper.registerKeyBinding(new KeyMapping(
                 "key.scaleme.sword_block",
+                InputConstants.Type.MOUSE,
                 GLFW.GLFW_MOUSE_BUTTON_RIGHT,
                 KeyMapping.Category.GAMEPLAY
         ));

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

@@ -102,7 +102,7 @@ public class ScaleMeConfig extends MidnightConfig {
     public static float armHeightScaleOffhand = -0.6f;
 
     @Comment(category = HAND, centered = true)
-    public static Comment spacer6;
+    public static Comment spacer5;
 
     @Entry(category = HAND, isSlider = true, min = 0.1f, max = 3f, precision = 1000)
     public static float itemScaleOffhand = 1f;
@@ -117,7 +117,7 @@ public class ScaleMeConfig extends MidnightConfig {
     public static float itemTranslationZOffhand = 0f;
 
     @Comment(category = HAND, centered = true)
-    public static Comment spacer7;
+    public static Comment spacer6;
 
     @Entry(category = HAND, isSlider = true, min = -180f, max = 180f, precision = 10)
     public static float itemRotationXOffhand = 0f;
@@ -134,10 +134,13 @@ public class ScaleMeConfig extends MidnightConfig {
     public static Comment animDesc;
 
     @Entry(category = ANIM)
-    public static boolean enableAnimOverrides = false;
+    public static boolean enableSwordBlock = false;
+
+    @Comment(category = HAND, centered = true)
+    public static Comment spacer7;
 
     @Entry(category = ANIM)
-    public static boolean enableSwordBlock = false;
+    public static boolean enableAnimOverrides = false;
 
     @Entry(category = ANIM)
     public static boolean disableSwingBobbing = false;

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

@@ -174,32 +174,28 @@ public class ItemInHandRendererMixin {
     /** 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,
+            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;
+        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;
+        int side = arm == HumanoidArm.RIGHT ? 1 : -1;
 
         applyItemArmTransform(poseStack, arm, equipProgress);
-        poseStack.translate((float) armSideSign * -0.14142136F, 0.08F, 0.14142136F);
+        poseStack.translate(side * -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));
+        poseStack.mulPose(Axis.YP.rotationDegrees(side * 13.365F));
+        poseStack.mulPose(Axis.ZP.rotationDegrees(side * 78.05F));
 
-        // Self-cast required: Mixin class can't directly extend ItemInHandRenderer
         ((ItemInHandRenderer) (Object) this).renderItem(
                 player,
                 heldItem,
@@ -210,7 +206,13 @@ public class ItemInHandRendererMixin {
                 collector,
                 packedLight
         );
-
         poseStack.popPose();
+
+        // --- release HandContext --- //
+        HandContext.renderDepth--;
+        if (HandContext.renderDepth <= 0) {
+            HandContext.renderDepth = 0;
+            HandContext.currentHand = null;
+        }
     }
 }

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

@@ -16,10 +16,10 @@ public static float resolveScale(Minecraft mc, int entityId) {
         boolean scalingAllowed = !onHypixel || HypixelLocationState.isOnSkyblock();
 
         if (entityId == mc.player.getId()) {
-            return scalingAllowed ? ScaleMeConfig.playerScale : 1f;
+            return ScaleMeConfig.playerScale;
         }
 
-        if (onHypixel && ScaleMeConfig.hypixelNpcScale != 1f) {
+        if (onHypixel) {
             var entity = mc.level.getEntity(entityId);
             if (entity instanceof AbstractClientPlayer player && HypixelNpcUtil.isHypixelNpc(player)) {
                 return HypixelLocationState.isInDungeon() ? 1f : ScaleMeConfig.hypixelNpcScale;

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

@@ -96,7 +96,7 @@
 
   "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": "Enable Sword Block",
   "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]",