From 633ac10d8927be0dc5d97908ebba35b012dba689 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 17 Jul 2022 16:25:23 +0200 Subject: [PATCH] Fix main hand in first person spectator view (fixes #731) --- .../com/replaymod/replay/camera/CameraEntity.java | 12 ++++++++++++ versions/1.14.4-forge/mapping.txt | 1 + 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index f9c6fe53..19ca60cd 100644 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -73,6 +73,7 @@ import net.minecraft.client.recipebook.ClientRecipeBook; //$$ import net.minecraft.stats.RecipeBook; //#endif //#endif +import net.minecraft.util.Arm; import net.minecraft.util.Hand; //#endif @@ -498,6 +499,17 @@ public class CameraEntity } //#endif + //#if MC>=10904 + @Override + public Arm getMainArm() { + Entity view = this.client.getCameraEntity(); + if (view != this && view instanceof PlayerEntity) { + return ((PlayerEntity) view).getMainArm(); + } + return super.getMainArm(); + } + //#endif + @Override public float getHandSwingProgress(float renderPartialTicks) { Entity view = this.client.getCameraEntity(); diff --git a/versions/1.14.4-forge/mapping.txt b/versions/1.14.4-forge/mapping.txt index 3bd9a84e..90dff9e6 100644 --- a/versions/1.14.4-forge/mapping.txt +++ b/versions/1.14.4-forge/mapping.txt @@ -23,6 +23,7 @@ org.lwjgl.glfw.GLFW com.replaymod.core.versions.GLFW net.minecraft.client.MainWindow com.replaymod.core.versions.Window net.minecraft.client.audio.SimpleSound net.minecraft.client.audio.PositionedSoundRecord net.minecraft.client.gui.IngameGui net.minecraft.client.gui.GuiIngame +net.minecraft.util.HandSide net.minecraft.util.EnumHandSide net.minecraft.resources.FolderPack getInputStream() getInputStreamByName() net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked()