1.21 fixes

Vivecraft · Sep 25, 2024 · b619c40 · b619c40
1 parent 9b9a785
commit b619c40
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
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
@@ -157,7 +157,7 @@ public void setupAnim(T pEntity, float pLimbSwing, float pLimbSwingAmount, float
         }
 
         // remove entity scale from that
-        float scale = 1.0F / ScaleHelper.getEntityScale(pEntity, Minecraft.getInstance().getFrameTime());
+        float scale = 1.0F / ScaleHelper.getEntityScale(pEntity, Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(false));
         Vec3 vec3 = rotinfo.leftArmPos.scale(scale);
         Vec3 vec32 = rotinfo.rightArmPos.scale(scale);
 

diff --git a/common/src/main/java/org/vivecraft/client_vr/gameplay/VRPlayer.java b/common/src/main/java/org/vivecraft/client_vr/gameplay/VRPlayer.java
@@ -147,7 +147,7 @@ public void preTick() {
             this.worldScale = rawWorldScale;
 
             // scale world with player size
-            this.worldScale *= ScaleHelper.getEntityScale(mc.player, mc.getFrameTime());
+            this.worldScale *= ScaleHelper.getEntityScale(mc.player, mc.getTimer().getGameTimeDeltaPartialTick(false));
             // limit scale
             if (this.worldScale > 100F) {
                 this.worldScale = 100F;

diff --git a/common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/BowTracker.java b/common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/BowTracker.java
@@ -127,7 +127,7 @@ public void doProcess(LocalPlayer player) {
             this.lastcanDraw = this.canDraw;
 
             // this is meant to be relative to the base Bb height, not the scaled one
-            this.maxDraw = (double) this.mc.player.getBbHeight() * 0.22D / ScaleHelper.getEntityBbScale(player, mc.getFrameTime());
+            this.maxDraw = (double) this.mc.player.getBbHeight() * 0.22D / ScaleHelper.getEntityBbScale(player, mc.getTimer().getGameTimeDeltaPartialTick(false));
 
             Vec3 vec3 = vrdata.getController(0).getPosition();
             Vec3 vec31 = vrdata.getController(1).getPosition();

diff --git a/common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/CrawlTracker.java b/common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/CrawlTracker.java
@@ -43,7 +43,7 @@ public void reset(LocalPlayer player) {
     }
 
     public void doProcess(LocalPlayer player) {
-        float scaleMultiplier = 1.0F / ScaleHelper.getEntityScale(player, mc.getFrameTime());
+        float scaleMultiplier = 1.0F / ScaleHelper.getEntityScale(player, mc.getTimer().getGameTimeDeltaPartialTick(false));
         this.crawling = this.dh.vr.hmdPivotHistory.averagePosition(0.2F).y * (double) this.dh.vrPlayer.worldScale * scaleMultiplier + (double) 0.1F < (double) this.dh.vrSettings.crawlThreshold;
         this.updateState(player);
     }