1.19.2 fix hand poly indices + sodium dependency

Vivecraft · Oct 7, 2023 · afc5ea5 · afc5ea5
1 parent 19774cc
commit afc5ea5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -18,6 +18,7 @@ dependencies {
     modCompileOnly "maven.modrinth:sodium:mc1.19.3-0.4.9"
     modCompileOnly "883067831485366304:1076634925077364786:sodium-fabric-mc1.19.3-0.4.10rev.c131708-dirty:jar"
     modCompileOnly("maven.modrinth:rubidium:0.6.1")
+    compileOnly 'org.joml:joml:1.10.4' //temp sodium
 
     // for iris compat
     modCompileOnly "maven.modrinth:iris:1.6.5+1.19.2"

diff --git a/common/src/main/java/org/vivecraft/client/render/VRPlayerModel_WithArms.java b/common/src/main/java/org/vivecraft/client/render/VRPlayerModel_WithArms.java
@@ -48,33 +48,33 @@ public VRPlayerModel_WithArms(ModelPart modelPart, boolean isSlim) {
         //finger hax
         // some mods remove the base parts
         if (!leftShoulder.cubes.isEmpty()) {
-            copyUV(leftShoulder.cubes.get(0).polygons[1], leftHand.cubes.get(0).polygons[1]);
-            copyUV(leftShoulder.cubes.get(0).polygons[1], leftHand.cubes.get(0).polygons[0]);
+            copyUV(leftShoulder.cubes.get(0).polygons[3], leftHand.cubes.get(0).polygons[3]);
+            copyUV(leftShoulder.cubes.get(0).polygons[3], leftHand.cubes.get(0).polygons[2]);
             if (SodiumHelper.isLoaded()) {
                 SodiumHelper.copyModelCuboidUV(leftShoulder, leftHand, 3, 3);
                 SodiumHelper.copyModelCuboidUV(leftShoulder, leftHand, 3, 2);
             }
         }
         if (!rightShoulder.cubes.isEmpty()) {
-            copyUV(rightShoulder.cubes.get(0).polygons[1], this.rightHand.cubes.get(0).polygons[1]);
-            copyUV(rightShoulder.cubes.get(0).polygons[1], this.rightHand.cubes.get(0).polygons[0]);
+            copyUV(rightShoulder.cubes.get(0).polygons[3], this.rightHand.cubes.get(0).polygons[3]);
+            copyUV(rightShoulder.cubes.get(0).polygons[3], this.rightHand.cubes.get(0).polygons[2]);
             if (SodiumHelper.isLoaded()) {
                 SodiumHelper.copyModelCuboidUV(rightShoulder, rightHand, 3, 3);
                 SodiumHelper.copyModelCuboidUV(rightShoulder, rightHand, 3, 2);
             }
         }
 
         if (!rightSleeve.cubes.isEmpty()) {
-            copyUV(rightShoulder_sleeve.cubes.get(0).polygons[1], this.rightSleeve.cubes.get(0).polygons[1]);
-            copyUV(rightShoulder_sleeve.cubes.get(0).polygons[1], this.rightSleeve.cubes.get(0).polygons[0]);
+            copyUV(rightShoulder_sleeve.cubes.get(0).polygons[3], this.rightSleeve.cubes.get(0).polygons[3]);
+            copyUV(rightShoulder_sleeve.cubes.get(0).polygons[3], this.rightSleeve.cubes.get(0).polygons[2]);
             if (SodiumHelper.isLoaded()) {
                 SodiumHelper.copyModelCuboidUV(rightShoulder_sleeve, rightSleeve, 3, 3);
                 SodiumHelper.copyModelCuboidUV(rightShoulder_sleeve, rightSleeve, 3, 2);
             }
         }
         if (!leftSleeve.cubes.isEmpty()) {
-            copyUV(leftShoulder_sleeve.cubes.get(0).polygons[1], leftSleeve.cubes.get(0).polygons[1]);
-            copyUV(leftShoulder_sleeve.cubes.get(0).polygons[1], leftSleeve.cubes.get(0).polygons[0]);
+            copyUV(leftShoulder_sleeve.cubes.get(0).polygons[3], leftSleeve.cubes.get(0).polygons[3]);
+            copyUV(leftShoulder_sleeve.cubes.get(0).polygons[3], leftSleeve.cubes.get(0).polygons[2]);
             if (SodiumHelper.isLoaded()) {
                 SodiumHelper.copyModelCuboidUV(leftShoulder_sleeve, leftSleeve, 3, 3);
                 SodiumHelper.copyModelCuboidUV(leftShoulder_sleeve, leftSleeve, 3, 2);