Merge branch 'refs/heads/11-camera-does-not-lean-while-train-is-on-a-…

…slope' into dev/v0.2.2

# Conflicts:
#	common/src/main/resources/create_train_perspective.mixins.json

common/src/main/java/net/derfruhling/minecraft/create/trainperspective/PlayerPerspectiveBehavior.java

@@ -5,4 +5,5 @@ public interface PlayerPerspectiveBehavior {
     void disable();
     void setLean(float lean);
     void setYaw(float yaw);
+    float getLean();
 }

common/src/main/java/net/derfruhling/minecraft/create/trainperspective/mixin/CameraMixin.java

@@ -0,0 +1,33 @@
+package net.derfruhling.minecraft.create.trainperspective.mixin;
+
+import net.derfruhling.minecraft.create.trainperspective.PlayerPerspectiveBehavior;
+import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(Camera.class)
+public class CameraMixin {
+    @Shadow private Entity entity;
+
+    @ModifyArg(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setRotation(FF)V", ordinal = 0), index = 1)
+    public float modifyXRotPrimary(float xRot) {
+        if(entity instanceof LocalPlayer player) {
+            var persp = (PlayerPerspectiveBehavior) Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
+            return xRot - persp.getLean();
+        } else return xRot;
+    }
+
+    @ModifyArg(method = "setup", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setRotation(FF)V", ordinal = 1), index = 1)
+    public float modifyXRotThirdPersonMirrored(float invertedXRot) {
+        if(entity instanceof LocalPlayer player) {
+            var persp = (PlayerPerspectiveBehavior) Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
+            return invertedXRot + persp.getLean();
+        } else return invertedXRot;
+    }
+}

common/src/main/java/net/derfruhling/minecraft/create/trainperspective/mixin/PlayerRendererMixin.java

@@ -39,6 +39,10 @@ public class PlayerRendererMixin {
         ctp$yaw = yaw;
     }
 
+    public float ctp$getLean() {
+        return ctp$lean;
+    }
+
     @Inject(
             method = "setupRotations(Lnet/minecraft/client/player/AbstractClientPlayer;Lcom/mojang/blaze3d/vertex/PoseStack;FFF)V",
             at = @At(

common/src/main/resources/create_train_perspective.mixins.json

@@ -5,7 +5,8 @@
   "compatibilityLevel": "JAVA_8",
   "client": [
     "PlayerRendererMixin",
-    "ContraptionColliderMixin"
+    "ContraptionColliderMixin",
+    "CameraMixin"
   ],
   "injectors": {
     "defaultRequire": 1