care more about whether the player is a client player than whether th…

…ey are the client's main player
der-fruhling-entertainment · May 17, 2024 · 551504d · 551504d
1 parent a41a2cc
commit 551504d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/...ain/java/net/derfruhling/minecraft/create/trainperspective/CreateTrainPerspectiveMod.java b/...ain/java/net/derfruhling/minecraft/create/trainperspective/CreateTrainPerspectiveMod.java
@@ -4,7 +4,7 @@
 import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
 import dev.architectury.event.events.common.TickEvent;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import org.slf4j.Logger;
@@ -26,7 +26,7 @@ public CreateTrainPerspectiveMod() {
 
     public void onEntityMount(boolean isMounting, Entity entityMounting, Entity entityBeingMounted) {
         if(
-                entityMounting instanceof LocalPlayer player &&
+                entityMounting instanceof AbstractClientPlayer player &&
                 entityBeingMounted instanceof CarriageContraptionEntity contraption
         ) {
             var persp = (Perspective) Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
@@ -67,11 +67,7 @@ public void tickStandingPlayer(final CarriageContraptionEntity contraption, fina
         }
     }
 
-    private void tickState(LocalPlayer player) {
-        var persp = (Perspective) Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
-        var state = persp.getRotationState();
-        if(state == null) return;
-
+    private void tickState(Player player, Perspective persp, RotationState state) {
         var carriage = state.getCarriageEntity();
         if(carriage == null) return;
         persp.setLean(carriage.pitch);
@@ -89,13 +85,14 @@ private void tickState(LocalPlayer player) {
     }
 
     public void onTickPlayer(final Player player) {
-        if(player instanceof LocalPlayer localPlayer) {
-            var persp = (Perspective) Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
+        if(!(player instanceof AbstractClientPlayer)) return;
+        if(Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player) instanceof Perspective persp
+           && persp.getRotationState() != null) {
             var state = persp.getRotationState();
-            if(state == null) return;
+            assert state != null;
 
             if(state.shouldTickState()) {
-                tickState(localPlayer);
+                tickState(player, persp, state);
             } else {
                 persp.diminish();
 

diff --git a/...on/src/main/java/net/derfruhling/minecraft/create/trainperspective/mixin/CameraMixin.java b/...on/src/main/java/net/derfruhling/minecraft/create/trainperspective/mixin/CameraMixin.java
@@ -8,7 +8,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import org.joml.Quaternionf;
@@ -57,7 +57,7 @@ public void modifyRotationsPrimary(Camera instance,
                                        float x,
                                        @Local(argsOnly = true, ordinal = 0) boolean isThirdPerson,
                                        @Local(argsOnly = true) float f) {
-        if(entity instanceof LocalPlayer player && !isThirdPerson) {
+        if(entity instanceof AbstractClientPlayer player && !isThirdPerson) {
             var persp = (Perspective) Minecraft.getInstance().getEntityRenderDispatcher().getRenderer(player);
             ctp$zRot = persp.getLean(f) * Mth.cos((persp.getYaw(f) - y) * Mth.DEG_TO_RAD);
             ctp$extraYRot = MixinUtil.getExtraYRot(persp, x, y, f);