feat: configurable relative head/body angle (#320)

* feat: configurable relative head/body angle

* fix: build

also add a lil guard thing

* cleanup: guard code

this does not fix the build issue. waiting till tomorrow to figure that out

* fix: guard code

* cleanup: use Inject instead of mixinextras

Author: elenawinters

NEAVersionless/src/main/java/dev/tr7zw/notenoughanimations/versionless/config/Config.java

@@ -73,4 +73,6 @@ public class Config {
             "minecraft:waxed_oxidized_copper_lantern", "minecraft:exposed_copper_lantern", "minecraft:lantern",
             "minecraft:waxed_weathered_copper_lantern", "minecraft:weathered_copper_lantern",
             "minecraft:oxidized_copper_lantern", "minecraft:copper_lantern"));
+    public float maxBlockingAngle = 15.0f;
+    public float maxNormalAngle = 50.0f;
 }

src/main/java/dev/tr7zw/notenoughanimations/config/ConfigScreenProvider.java

@@ -123,6 +123,20 @@ public CustomConfigScreen(Screen previous) {
             options.add(getOnOffOption("text.nea.enable.rotationlocking", () -> NEABaseMod.config.enableRotationLocking,
                     b -> NEABaseMod.config.enableRotationLocking = b));
 
+            //? if >= 1.20.4 {
+            options.add(getSplitLine(""));
+            options.add(getSplitLine("text.nea.line.rotationAngle"));
+            options.add(getDoubleOption("text.nea.maxNormalAngle", 0.0f, 50.0f, 0.1f,
+                    () -> (double) NEABaseMod.config.maxNormalAngle, (i) -> {
+                        NEABaseMod.config.maxNormalAngle = (float) i;
+                    }));
+
+            options.add(getDoubleOption("text.nea.maxBlockingAngle", 0.0f, 15.0f, 0.1f,
+                    () -> (double) NEABaseMod.config.maxBlockingAngle, (i) -> {
+                        NEABaseMod.config.maxBlockingAngle = (float) i;
+                    }));
+            //? }
+
             options.add(getSplitLine(""));
             options.add(getSplitLine("text.nea.line.holdup"));
             options.add(getEnumOption("text.nea.holdUpItemsMode", HoldUpModes.class,

src/main/java/dev/tr7zw/notenoughanimations/mixins/PlayerEntityMixin.java

@@ -8,9 +8,11 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import dev.tr7zw.notenoughanimations.access.PlayerData;
 import dev.tr7zw.notenoughanimations.logic.PlayerTransformer;
+import dev.tr7zw.notenoughanimations.versionless.NEABaseMod;
 import dev.tr7zw.notenoughanimations.versionless.animations.DataHolder;
 import lombok.Getter;
 import lombok.Setter;
@@ -46,6 +48,22 @@ public void tick(CallbackInfo info) {
         setRotateBodyToHead(false);
     }
 
+    //? if >= 1.20.4 {
+    @Inject(method = "getMaxHeadRotationRelativeToBody", at = @At("HEAD"), cancellable = true)
+    protected void overrideMaxHeadRoationRelativeToBody(CallbackInfoReturnable<Float> ci) {
+        if (NEABaseMod.config.maxBlockingAngle < 0.0f || NEABaseMod.config.maxBlockingAngle > 15.0f) {
+            NEABaseMod.config.maxBlockingAngle = 15.0f;
+        }
+
+        if (NEABaseMod.config.maxNormalAngle < 0.0f || NEABaseMod.config.maxNormalAngle > 50.0f) {
+            NEABaseMod.config.maxNormalAngle = 50.0f;
+        }
+
+        Player player = (Player) (Object) this;
+        ci.setReturnValue(player.isBlocking() ? NEABaseMod.config.maxBlockingAngle : NEABaseMod.config.maxNormalAngle);
+    }
+    //? }
+
     @Override
     public int isUpdated(int frameId) {
         return Math.abs(frameId - armsUpdated);

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

@@ -10,6 +10,7 @@
     "text.nea.line.rotation": "Rotation",
     "text.nea.line.smoothing": "Smoothing",
     "text.nea.line.animations": "Animations",
+    "text.nea.line.rotationAngle": "Rotation Angle",
     "text.nea.enable.animationsmoothing": "Animation Smoothing",
     "text.nea.enable.animationsmoothing.tooltip": "Smooths out the arm/leg animations to make them look more natural and less jumpy",
     "text.nea.smoothingSpeed": "Smoothing Amount",
@@ -100,5 +101,9 @@
     "text.nea.animateLanterns": "Animate Lanterns",
     "text.nea.animateLanterns.tooltip": "Adds a swinging animation to lanterns while held",
     "text.nea.enable.applyRotationLockToEveryone": "Apply Rotation Lock To Everyone",
-    "text.nea.enable.applyRotationLockToEveryone.tooltip": "Apply rotation lock to everyone and not just the player"
+    "text.nea.enable.applyRotationLockToEveryone.tooltip": "Apply rotation lock to everyone and not just the player",
+    "text.nea.maxNormalAngle": "Normal Angle",
+    "text.nea.maxNormalAngle.tooltip": "Set your normal rotation lock angle. Only works in None mode.",
+    "text.nea.maxBlockingAngle": "Blocking Angle",
+    "text.nea.maxBlockingAngle.tooltip": "Set your blocking rotation lock angle. Only works in None mode."
 }