Skip to content

Commit b619c40

Browse files
committed
1.21 fixes
1 parent 9b9a785 commit b619c40

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

common/src/main/java/org/vivecraft/client/render/VRPlayerModel_WithArms.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void setupAnim(T pEntity, float pLimbSwing, float pLimbSwingAmount, float
157157
}
158158

159159
// remove entity scale from that
160-
float scale = 1.0F / ScaleHelper.getEntityScale(pEntity, Minecraft.getInstance().getFrameTime());
160+
float scale = 1.0F / ScaleHelper.getEntityScale(pEntity, Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(false));
161161
Vec3 vec3 = rotinfo.leftArmPos.scale(scale);
162162
Vec3 vec32 = rotinfo.rightArmPos.scale(scale);
163163

common/src/main/java/org/vivecraft/client_vr/gameplay/VRPlayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void preTick() {
147147
this.worldScale = rawWorldScale;
148148

149149
// scale world with player size
150-
this.worldScale *= ScaleHelper.getEntityScale(mc.player, mc.getFrameTime());
150+
this.worldScale *= ScaleHelper.getEntityScale(mc.player, mc.getTimer().getGameTimeDeltaPartialTick(false));
151151
// limit scale
152152
if (this.worldScale > 100F) {
153153
this.worldScale = 100F;

common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/BowTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void doProcess(LocalPlayer player) {
127127
this.lastcanDraw = this.canDraw;
128128

129129
// this is meant to be relative to the base Bb height, not the scaled one
130-
this.maxDraw = (double) this.mc.player.getBbHeight() * 0.22D / ScaleHelper.getEntityBbScale(player, mc.getFrameTime());
130+
this.maxDraw = (double) this.mc.player.getBbHeight() * 0.22D / ScaleHelper.getEntityBbScale(player, mc.getTimer().getGameTimeDeltaPartialTick(false));
131131

132132
Vec3 vec3 = vrdata.getController(0).getPosition();
133133
Vec3 vec31 = vrdata.getController(1).getPosition();

common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/CrawlTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void reset(LocalPlayer player) {
4343
}
4444

4545
public void doProcess(LocalPlayer player) {
46-
float scaleMultiplier = 1.0F / ScaleHelper.getEntityScale(player, mc.getFrameTime());
46+
float scaleMultiplier = 1.0F / ScaleHelper.getEntityScale(player, mc.getTimer().getGameTimeDeltaPartialTick(false));
4747
this.crawling = this.dh.vr.hmdPivotHistory.averagePosition(0.2F).y * (double) this.dh.vrPlayer.worldScale * scaleMultiplier + (double) 0.1F < (double) this.dh.vrSettings.crawlThreshold;
4848
this.updateState(player);
4949
}

0 commit comments

Comments
 (0)