fix: renderstate casting crash with mounts

Author: bconlon1

common/src/main/java/com/aetherteam/cumulus/client/event/hooks/WorldPreviewHooks.java

@@ -3,12 +3,12 @@
 import com.aetherteam.cumulus.CumulusConfig;
 import com.aetherteam.cumulus.client.WorldDisplayHelper;
 import com.aetherteam.cumulus.mixin.mixins.client.accessor.EntityRendererAccessor;
+import com.aetherteam.cumulus.mixin.extensions.EntityRenderStateExtension;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.LivingEntityRenderer;
 import net.minecraft.client.renderer.entity.state.EntityRenderState;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
@@ -119,9 +119,10 @@ public static boolean shouldHidePlayer() {
      * @return The {@link Boolean} result.
      */
     public static <T extends Entity, S extends EntityRenderState> boolean shouldHideEntity(EntityRenderer<T, S> renderer, EntityRenderState renderState, float partialTick) {
-        return WorldDisplayHelper.isActive() && Minecraft.getInstance().player != null
-                && Minecraft.getInstance().player.getVehicle() != null
-                && renderer.createRenderState((T) Minecraft.getInstance().player.getVehicle(), partialTick).equals(renderState);
+        if (WorldDisplayHelper.isActive() && Minecraft.getInstance().player != null && Minecraft.getInstance().player.getVehicle() != null) {
+            return Minecraft.getInstance().player.getVehicle().getUUID().equals(((EntityRenderStateExtension) renderState).cumulus$getUUID());
+        }
+        return false;
     }
 
     /**

common/src/main/java/com/aetherteam/cumulus/mixin/extensions/EntityRenderStateExtension.java

@@ -0,0 +1,9 @@
+package com.aetherteam.cumulus.mixin.extensions;
+
+import java.util.UUID;
+
+public interface EntityRenderStateExtension {
+    UUID cumulus$getUUID();
+
+    void cumulus$setUUID(UUID uuid);
+}

common/src/main/java/com/aetherteam/cumulus/mixin/mixins/client/EntityRenderStateMixin.java

@@ -0,0 +1,24 @@
+package com.aetherteam.cumulus.mixin.mixins.client;
+
+import com.aetherteam.cumulus.mixin.extensions.EntityRenderStateExtension;
+import net.minecraft.client.renderer.entity.state.EntityRenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import java.util.UUID;
+
+@Mixin(EntityRenderState.class)
+public class EntityRenderStateMixin implements EntityRenderStateExtension {
+    @Unique
+    private UUID uuid = UUID.randomUUID();
+
+    @Override
+    public UUID cumulus$getUUID() {
+        return this.uuid;
+    }
+
+    @Override
+    public void cumulus$setUUID(UUID uuid) {
+        this.uuid = uuid;
+    }
+}

common/src/main/java/com/aetherteam/cumulus/mixin/mixins/client/EntityRendererMixin.java

@@ -0,0 +1,18 @@
+package com.aetherteam.cumulus.mixin.mixins.client;
+
+import com.aetherteam.cumulus.mixin.extensions.EntityRenderStateExtension;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.state.EntityRenderState;
+import net.minecraft.world.entity.Entity;
+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(EntityRenderer.class)
+public class EntityRendererMixin<T extends Entity, S extends EntityRenderState> {
+    @Inject(at = @At(value = "HEAD"), method = "extractRenderState(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;F)V")
+    public void render(T entity, S entityRenderState, float f, CallbackInfo ci) {
+        ((EntityRenderStateExtension) entityRenderState).cumulus$setUUID(entity.getUUID());
+    }
+}

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

@@ -6,13 +6,13 @@
   "compatibilityLevel": "JAVA_18",
   "mixins": [],
   "client": [
-    "client.MinecraftServerMixin",
-    "common.DirectoryLockMixin",
-    "common.accessor.MinecraftServerAccessor",
     "client.CameraMixin",
     "client.ConnectScreenMixin",
     "client.CreateWorldScreenMixin",
+    "client.EntityRendererMixin",
+    "client.EntityRenderStateMixin",
     "client.FaviconTextureMixin",
+    "client.MinecraftServerMixin",
     "client.MusicManagerMixin",
     "client.PanoramaRendererMixin",
     "client.PauseScreenMixin",
@@ -24,7 +24,9 @@
     "client.accessor.MinecraftAccessor",
     "client.accessor.ScreenAccessor",
     "client.accessor.SplashRendererAccessor",
-    "client.accessor.TitleScreenAccessor"
+    "client.accessor.TitleScreenAccessor",
+    "common.DirectoryLockMixin",
+    "common.accessor.MinecraftServerAccessor"
   ],
   "server": [],
   "injectors": {