Add support for scaling Villager NPCs

Author: KdGaming0

src/main/java/com/github/kd_gaming1/scaleme/client/mixin/LivingEntityRendererMixin.java

@@ -0,0 +1,40 @@
+package com.github.kd_gaming1.scaleme.client.mixin;
+
+import com.github.kd_gaming1.scaleme.client.util.HypixelNpcUtil;
+import com.github.kd_gaming1.scaleme.client.util.ScaleManager;
+import com.github.kd_gaming1.scaleme.client.util.VillagerEntityRenderStateAccessor;
+import com.github.kd_gaming1.scaleme.config.ScaleMeConfig;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.client.render.entity.state.LivingEntityRenderState;
+import net.minecraft.client.render.entity.state.VillagerEntityRenderState;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.passive.VillagerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LivingEntityRenderer.class)
+public class LivingEntityRendererMixin {
+
+    @Inject(method = "scale(Lnet/minecraft/client/render/entity/state/LivingEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;)V",
+            at = @At("HEAD"),
+            cancellable = true)
+    private void scaleVillagerNpc(LivingEntityRenderState renderState, MatrixStack matrixStack, CallbackInfo ci) {
+        // Check if this is a villager render state
+        if (renderState instanceof VillagerEntityRenderState villagerRenderState) {
+            VillagerEntityRenderStateAccessor accessor = (VillagerEntityRenderStateAccessor) villagerRenderState;
+            VillagerEntity villager = accessor.scaleme$getVillagerEntity();
+
+            // Check if this is a Hypixel NPC and scaling is enabled
+            if (ScaleMeConfig.enableVillagerNpcScaling) {
+                float scale = ScaleManager.getVillagerNpcScale();
+                if (scale != 1.0f) {
+                    matrixStack.scale(scale, scale, scale);
+                }
+                ci.cancel(); // Prevent vanilla scaling
+                return;
+            }
+        }
+    }
+}

src/main/java/com/github/kd_gaming1/scaleme/client/mixin/PlayerEntityRendererMixin.java

@@ -34,15 +34,16 @@ private void scalePlayerModel(PlayerEntityRenderState playerEntityRenderState, M
 
         // --- Regular Hypixel NPC Scaling ---
         if (ScaleMeConfig.enableNpcScaling && HypixelNpcUtil.isHypixelNpc(player)) {
-            float scale = ScaleMeConfig.npcPlayerScale;
+            // Create a centralized method for NPC scaling with safety check
+            float scale = ScaleManager.getNpcScale();
             if (scale != 1.0f) {
                 matrixStack.scale(scale, scale, scale);
             }
             ci.cancel();
             return;
         }
 
-        // --- Normal Player Scaling ---
+        // --- Normal Player Scaling (already has safety check in getCurrentScale) ---
         if (playerUUID != null) {
             float scale = ScaleManager.getCurrentScale(playerUUID);
             if (scale != 1.0f) {

src/main/java/com/github/kd_gaming1/scaleme/client/mixin/VillagerEntityRenderStateMixin.java

@@ -0,0 +1,24 @@
+package com.github.kd_gaming1.scaleme.client.mixin;
+
+import com.github.kd_gaming1.scaleme.client.util.VillagerEntityRenderStateAccessor;
+import net.minecraft.client.render.entity.state.VillagerEntityRenderState;
+import net.minecraft.entity.passive.VillagerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(VillagerEntityRenderState.class)
+public class VillagerEntityRenderStateMixin implements VillagerEntityRenderStateAccessor {
+
+    @Unique
+    private VillagerEntity scaleme$villagerEntity;
+
+    @Override
+    public void scaleme$setVillagerEntity(VillagerEntity villager) {
+        this.scaleme$villagerEntity = villager;
+    }
+
+    @Override
+    public VillagerEntity scaleme$getVillagerEntity() {
+        return this.scaleme$villagerEntity;
+    }
+}

src/main/java/com/github/kd_gaming1/scaleme/client/util/ScaleManager.java

@@ -1,5 +1,7 @@
 package com.github.kd_gaming1.scaleme.client.util;
 
+import com.github.kd_gaming1.scaleme.config.ScaleMeConfig;
+
 import java.util.UUID;
 
 /**
@@ -28,4 +30,18 @@ public static void tick() {
     public static float getCurrentScale(UUID playerUUID) {
         return PlayerPresetManager.getCurrentScale(playerUUID);
     }
+
+    /** Returns NPC scale with safety check including dungeons detection. */
+    public static float getNpcScale() {
+        // Disable NPC scaling in competitive modes AND dungeons
+
+        return ScaleMeConfig.npcPlayerScale;
+    }
+
+    /** Returns Villager NPC scale with safety check including dungeons detection. */
+    public static float getVillagerNpcScale() {
+        // Disable Villager NPC scaling in competitive modes AND dungeons
+
+        return ScaleMeConfig.villagerNpcScale;
+    }
 }

src/main/java/com/github/kd_gaming1/scaleme/client/util/VillagerEntityRenderStateAccessor.java

@@ -0,0 +1,8 @@
+package com.github.kd_gaming1.scaleme.client.util;
+
+import net.minecraft.entity.passive.VillagerEntity;
+
+public interface VillagerEntityRenderStateAccessor {
+    void scaleme$setVillagerEntity(VillagerEntity villager);
+    VillagerEntity scaleme$getVillagerEntity();
+}

src/main/resources/scaleme.mixins.json

@@ -6,12 +6,11 @@
   "refmap": "scaleme.refmap.json",
   "client": [
     "LivingEntityRendererMixin",
-    "LivingEntityRenderStateAccessor",
     "MixinInGameHud",
     "PerspectiveMixin",
     "PlayerEntityRendererMixin",
     "PlayerEntityRenderStateMixin",
-    "VillagerEntityRendererMixin"
+    "VillagerEntityRenderStateMixin"
   ],
   "injectors": {
     "defaultRequire": 1