From 6f6b6b7246ab628125aa5f3ecb17ffac318fa21e Mon Sep 17 00:00:00 2001
From: CG360 <16578982+CloudG360@users.noreply.github.com>
Date: Tue, 17 Oct 2023 09:14:49 +0100
Subject: [PATCH] Fixed hook rotation math being passed as degrees rather than
 radians (so now it doesn't spin like crazy)

---
 .../grapplehook/RenderGrapplehookEntity.java  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yyon/grapplinghook/entities/grapplehook/RenderGrapplehookEntity.java b/src/main/java/com/yyon/grapplinghook/entities/grapplehook/RenderGrapplehookEntity.java
index b60452f..da675d1 100644
--- a/src/main/java/com/yyon/grapplinghook/entities/grapplehook/RenderGrapplehookEntity.java
+++ b/src/main/java/com/yyon/grapplinghook/entities/grapplehook/RenderGrapplehookEntity.java
@@ -6,7 +6,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
@@ -25,6 +24,7 @@
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;
+import org.joml.Vector3f;
 
 
 /*
@@ -54,6 +54,12 @@ public class RenderGrapplehookEntity<T extends GrapplehookEntity> extends Entity
     private static final RenderType ROPE_RENDER = RenderType.entitySolid(ROPE_TEXTURES);
     EntityRendererProvider.Context context;
 
+
+	public static final Vector3f X_AXIS = new Vector3f(1, 0, 0);
+	public static final Vector3f Y_AXIS = new Vector3f(0, 1, 0);
+	public static final Vector3f Z_AXIS = new Vector3f(0, 0, 1);
+
+
 	public RenderGrapplehookEntity(EntityRendererProvider.Context context, Item itemIn) {
 		super(context);
 		this.item = itemIn;
@@ -157,10 +163,10 @@ public void render(T hookEntity, float p_225623_2_, float partialTicks, PoseStac
 		matrix.pushPose();
 		matrix.scale(0.5F, 0.5F, 0.5F);
 		
-		matrix.mulPose(new Quaternionf().setAngleAxis((float) (-attach_dir.getYaw()),0, 1, 0 ));
-		matrix.mulPose(new Quaternionf().setAngleAxis((float) (attach_dir.getPitch() - 90), 1, 0, 0 ));
-		matrix.mulPose(new Quaternionf().setAngleAxis((float) (45 * hand_right), 0, 1, 0 ));
-		matrix.mulPose(new Quaternionf().setAngleAxis((float) (-45), 0, 0, 1 ));
+		matrix.mulPose(rotatedAxis(-attach_dir.getYaw(), Y_AXIS));
+		matrix.mulPose(rotatedAxis(attach_dir.getPitch() - 90, X_AXIS));
+		matrix.mulPose(rotatedAxis(45.0f * hand_right, Y_AXIS));
+		matrix.mulPose(rotatedAxis(-45.0f, Z_AXIS));
 		
 		// draw hook
 		ItemStack stack = this.getStackToRender(hookEntity);
@@ -358,8 +364,7 @@ public boolean shouldRender(T p_225626_1_, Frustum p_225626_2_, double p_225626_
 		return true;
 	}
 
-	public ItemStack getStackToRender(T entityIn)
-    {
+	public ItemStack getStackToRender(T entityIn) {
 		ItemStack stack = new ItemStack(this.item);
 		CompoundTag tag = stack.getOrCreateTag();
 		tag.putBoolean("hook", true);
@@ -367,6 +372,10 @@ public ItemStack getStackToRender(T entityIn)
         return stack;
     }
 
+	public static Quaternionf rotatedAxis(double angleDegrees, Vector3f axis) {
+		return new Quaternionf().rotateAxis((float) Math.toRadians(angleDegrees), axis);
+	}
+
     /**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */