Begin 2.4 cycle & Cleanup

Author: lowercasebtw

CHANGELOG.md

@@ -1,2 +0,0 @@
-- Add debug setting for debugging/logging (Removes log spam #22)
-- Update LightConfig

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 # Mod properties
 mod.name=Skyboxify
 mod.id=skyboxify
-mod.version=2.3
+mod.version=2.4
 mod.group=btw.lowercase
 mod.description=A skybox mod that allows you to use OptiFine skies in Fabric 1.21+
 mod.source=https://github.com/Legacy-Visuals-Project/Skyboxify

src/main/java/btw/lowercase/skyboxify/skybox/SkyboxSkyRenderer.java

@@ -131,7 +131,7 @@ private void renderSkyLayer(final SkyLayer skyLayer, final Matrix4f modelViewMat
         final float finalAlpha = Mth.clamp(conditionAlpha * weatherAlpha * fadeAlpha, 0.0F, 1.0F);
         if (!(finalAlpha < 1.0E-4F)) {
             if (skyLayer.rotate()) {
-                CommonUtils.mulPose(modelViewMatrix, this.getAngle(level, skyAngle, skyLayer.speed()), skyLayer.axis());
+				CommonUtils.rotate(modelViewMatrix, this.getAngle(level, skyAngle, skyLayer.speed()), skyLayer.axis());
             }
 
             //? <=1.21.4 {

src/main/java/btw/lowercase/skyboxify/utils/CommonUtils.java

@@ -28,7 +28,9 @@
 import lombok.experimental.UtilityClass;
 import net.minecraft.util.Mth;
 import org.joml.Matrix4f;
+import org.joml.Vector3f;
 import org.joml.Vector3fc;
+import org.joml.Vector4f;
 
 import java.util.List;
 
@@ -112,49 +114,45 @@ public static float getWeatherAlpha(List<Weather> weatherConditions, float rainS
 		return Mth.clamp(weatherAlpha, 0.0F, 1.0F);
 	}
 
-    // This method replicates the old Mojang-made Quaternion mulPose method, which was
-    // used for the initial sky transformations which did not have any bobbing issues.
-    // See https://github.com/sp614x/optifine/issues/7235#issuecomment-1581930719
-    public static void mulPose(Matrix4f pose, float angle, Vector3fc axis) {
-        // Quaternion fields
-        float q_sin = Mth.sin(angle * 0.5F);
-        float q_x = axis.x() * q_sin;
-        float q_y = axis.y() * q_sin;
-        float q_z = axis.z() * q_sin;
-        float q_w = Mth.cos(angle * 0.5F);
-
-        // Matrix4f/Matrix3f fields
-        float m_xFactor = 2.0F * q_x * q_x;
-        float m_yFactor = 2.0F * q_y * q_y;
-        float m_zFactor = 2.0F * q_z * q_z;
-        float m_xy = q_x * q_y;
-        float m_yz = q_y * q_z;
-        float m_zx = q_z * q_x;
-        float m_xw = q_x * q_w;
-        float m_yw = q_y * q_w;
-        float m_zw = q_z * q_w;
-        float m_m00 = 1.0F - m_yFactor - m_zFactor;
-        float m_m01 = 2.0F * (m_xy - m_zw);
-        float m_m02 = 2.0F * (m_zx + m_yw);
-        float m_m10 = 2.0F * (m_xy + m_zw);
-        float m_m11 = 1.0F - m_zFactor - m_xFactor;
-        float m_m12 = 2.0F * (m_yz - m_xw);
-        float m_m20 = 2.0F * (m_zx - m_yw);
-        float m_m21 = 2.0F * (m_yz + m_xw);
-        float m_m22 = 1.0F - m_xFactor - m_yFactor;
-
-        // Multiply pose matrix
-        pose.m00(m_m00 * pose.m00() + m_m01 * pose.m10() + m_m02 * pose.m20());
-        pose.m01(m_m00 * pose.m01() + m_m01 * pose.m11() + m_m02 * pose.m21());
-        pose.m02(m_m00 * pose.m02() + m_m01 * pose.m12() + m_m02 * pose.m22());
-        pose.m03(m_m00 * pose.m03() + m_m01 * pose.m13() + m_m02 * pose.m23());
-        pose.m10(m_m10 * pose.m00() + m_m11 * pose.m10() + m_m12 * pose.m20());
-        pose.m11(m_m10 * pose.m01() + m_m11 * pose.m11() + m_m12 * pose.m21());
-        pose.m12(m_m10 * pose.m02() + m_m11 * pose.m12() + m_m12 * pose.m22());
-        pose.m13(m_m10 * pose.m03() + m_m11 * pose.m13() + m_m12 * pose.m23());
-        pose.m20(m_m20 * pose.m00() + m_m21 * pose.m10() + m_m22 * pose.m20());
-        pose.m21(m_m20 * pose.m01() + m_m21 * pose.m11() + m_m22 * pose.m21());
-        pose.m22(m_m20 * pose.m02() + m_m21 * pose.m12() + m_m22 * pose.m22());
-        pose.m23(m_m20 * pose.m03() + m_m21 * pose.m13() + m_m22 * pose.m23());
-    }
+	// This method replicates the old Mojang-made Quaternion mulPose method, which was
+	// used for the initial sky transformations which did not have any bobbing issues.
+	// See https://github.com/sp614x/optifine/issues/7235#issuecomment-1581930719
+	public static void rotate(final Matrix4f pose, final float angle, final Vector3fc axis) {
+		// Quaternion fields
+		final Vector4f q = new Vector4f(axis.mul(Mth.sin(angle * 0.5F), new Vector3f()), Mth.cos(angle * 0.5F));
+
+		// Matrix4f/Matrix3f fields
+		float m_xFactor = 2.0F * q.x * q.x;
+		float m_yFactor = 2.0F * q.y * q.y;
+		float m_zFactor = 2.0F * q.z * q.z;
+		float m_xy = q.x * q.y;
+		float m_yz = q.y * q.z;
+		float m_zx = q.z * q.x;
+		float m_xw = q.x * q.w;
+		float m_yw = q.y * q.w;
+		float m_zw = q.z * q.w;
+		float m_m00 = 1.0F - m_yFactor - m_zFactor;
+		float m_m01 = 2.0F * (m_xy - m_zw);
+		float m_m02 = 2.0F * (m_zx + m_yw);
+		float m_m10 = 2.0F * (m_xy + m_zw);
+		float m_m11 = 1.0F - m_zFactor - m_xFactor;
+		float m_m12 = 2.0F * (m_yz - m_xw);
+		float m_m20 = 2.0F * (m_zx - m_yw);
+		float m_m21 = 2.0F * (m_yz + m_xw);
+		float m_m22 = 1.0F - m_xFactor - m_yFactor;
+
+		// Multiply pose matrix
+		pose.m00(m_m00 * pose.m00() + m_m01 * pose.m10() + m_m02 * pose.m20())
+				.m01(m_m00 * pose.m01() + m_m01 * pose.m11() + m_m02 * pose.m21())
+				.m02(m_m00 * pose.m02() + m_m01 * pose.m12() + m_m02 * pose.m22())
+				.m03(m_m00 * pose.m03() + m_m01 * pose.m13() + m_m02 * pose.m23())
+				.m10(m_m10 * pose.m00() + m_m11 * pose.m10() + m_m12 * pose.m20())
+				.m11(m_m10 * pose.m01() + m_m11 * pose.m11() + m_m12 * pose.m21())
+				.m12(m_m10 * pose.m02() + m_m11 * pose.m12() + m_m12 * pose.m22())
+				.m13(m_m10 * pose.m03() + m_m11 * pose.m13() + m_m12 * pose.m23())
+				.m20(m_m20 * pose.m00() + m_m21 * pose.m10() + m_m22 * pose.m20())
+				.m21(m_m20 * pose.m01() + m_m21 * pose.m11() + m_m22 * pose.m21())
+				.m22(m_m20 * pose.m02() + m_m21 * pose.m12() + m_m22 * pose.m22())
+				.m23(m_m20 * pose.m03() + m_m21 * pose.m13() + m_m22 * pose.m23());
+	}
 }