Merge remote-tracking branch 'remotes/origin/Multiloader-1.20.5' into…

… Multiloader-1.21
QuestCraftPlusPlus · Sep 27, 2024 · eea1369 · eea1369
2 parents a0e55d5 + 5750107
commit eea1369
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/common/src/main/java/org/vivecraft/client_vr/render/VivecraftItemRendering.java b/common/src/main/java/org/vivecraft/client_vr/render/VivecraftItemRendering.java
@@ -344,9 +344,12 @@ public static void applyFirstPersonItemTransforms(PoseStack pMatrixStack, Vivecr
                     translateY = 0.0D;
                     translateX = 0.0D;
                 } else if (rendertype == VivecraftItemTransformType.Mace) {
-                    translateX = 0.00D;
-                    translateY = 0.02D;
-                    translateZ = -0.07D;
+                    preRotation = Axis.XP.rotationDegrees((float) gunAngle);
+                    translateX = 0.0D;
+                    translateY = 0.0125;
+                    translateZ = -0.06;
+                    rotation = rotation.mul(Axis.XP.rotationDegrees((float) -gunAngle));
+                    scale = 0.56F;
                 }
             }
         } else {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.21
 enabled_platforms=fabric,forge,neoforge
 
 archives_base_name=vivecraft
-mod_version=1.1.12-b4
+mod_version=1.1.12-b5
 maven_group=org.vivecraft
 
 architectury_version=12.0.26