Skip to content

Commit 7cde87c

Browse files
committed
Get tick deltas from the RenderTickCounter
1 parent b92b76c commit 7cde87c

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

src/main/java/de/dafuqs/spectrum/blocks/spirit_sallow/WindStrength.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class WindStrength {
1717
public Vec3d getWindStrength(World world) {
1818
long tick = world.getTime();
1919
if (tick != cachedTick) {
20-
float tickDelta = MinecraftClient.getInstance().getTickDelta();
20+
float tickDelta = MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false);
2121
cachedValue = new Vec3d(
2222
SAMPLER.sample((tick + tickDelta) / 512D, 0, 0),
2323
SAMPLER.sample(0, (tick + tickDelta) / 512D, 0),

src/main/java/de/dafuqs/spectrum/deeper_down/DarknessEffects.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static float getInterp() {
149149
if (client.cameraEntity == null)
150150
return interp;
151151

152-
var y = MathHelper.lerp(client.getTickDelta(), client.cameraEntity.lastRenderY, client.cameraEntity.getY());
152+
double y = MathHelper.lerp(client.getRenderTickCounter().getTickDelta(false), client.cameraEntity.lastRenderY, client.cameraEntity.getY());
153153
float adjustedInterp;
154154

155155
//entrance darkening
@@ -170,7 +170,7 @@ public static float getNear(float start) {
170170
if (client.cameraEntity == null)
171171
return near;
172172

173-
var y = MathHelper.lerp(client.getTickDelta(), client.cameraEntity.lastRenderY, client.cameraEntity.getY());
173+
var y = MathHelper.lerp(client.getRenderTickCounter().getTickDelta(false), client.cameraEntity.lastRenderY, client.cameraEntity.getY());
174174
float distance;
175175

176176
if (y < -272) {
@@ -190,7 +190,7 @@ public static float getFar(float end) {
190190
}
191191

192192
public static float getDarknessInterpolation() {
193-
return MathHelper.lerp(MinecraftClient.getInstance().getTickDelta(), (float) DarknessEffects.darkenTicks, DarknessEffects.lastDarkenTicks) / INTERP_TICKS * getInterp();
193+
return MathHelper.lerp(MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false), (float) DarknessEffects.darkenTicks, DarknessEffects.lastDarkenTicks) / INTERP_TICKS * getInterp();
194194
}
195195

196196
static {

src/main/java/de/dafuqs/spectrum/items/energy/ArtistsPaletteItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public ExtendedItemBarProvider.BarSignature getSignature(@Nullable PlayerEntity
105105

106106
if(colors.isEmpty()) return new ExtendedItemBarProvider.BarSignature(1, 13, 14, progress, 1, 0xFF000000, 2, DEFAULT_BACKGROUND_COLOR);
107107

108-
var delta = MinecraftClient.getInstance().getTickDelta();
108+
var delta = MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false);
109109
var curColor = colors.get((int) (time % (30L * colors.size()) / 30));
110110
var nextColor = colors.get((int) ((time % (30L * colors.size()) / 30 + 1) % colors.size()));
111111

src/main/java/de/dafuqs/spectrum/items/energy/InkAssortmentItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public ExtendedItemBarProvider.BarSignature getSignature(@Nullable PlayerEntity
8989
return new ExtendedItemBarProvider.BarSignature(1, 13, 14, progress, 1, ColorHelper.colorVecToRGB(color.getColorVec()) | 0xFF000000, 2, DEFAULT_BACKGROUND_COLOR);
9090
}
9191

92-
var delta = MinecraftClient.getInstance().getTickDelta();
92+
var delta = MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false);
9393
var curColor = colors.get((int) (time % (30L * colors.size()) / 30));
9494
var nextColor = colors.get((int) ((time % (30L * colors.size()) / 30 + 1) % colors.size()));
9595

src/main/java/de/dafuqs/spectrum/items/energy/PigmentPaletteItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public ExtendedItemBarProvider.BarSignature getSignature(@Nullable PlayerEntity
102102
return new ExtendedItemBarProvider.BarSignature(1, 13, 14, progress, 1, color.getColorInt() | 0xFF000000, 2, DEFAULT_BACKGROUND_COLOR);
103103
}
104104

105-
var delta = MinecraftClient.getInstance().getTickDelta();
105+
var delta = MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false);
106106
var curColor = colors.get((int) (time % (30L * colors.size()) / 30));
107107
var nextColor = colors.get((int) ((time % (30L * colors.size()) / 30 + 1) % colors.size()));
108108

src/main/java/de/dafuqs/spectrum/mixin/client/DimensionTypeMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public abstract class DimensionTypeMixin {
1414
@ModifyArg(method = "getSkyAngle", at = @At(value = "INVOKE", target = "Ljava/util/OptionalLong;orElse(J)J"))
1515
private long spectrum$getLerpedSkyAngle(long time) {
1616
if (!MinecraftClient.getInstance().isPaused() && SpectrumClient.skyLerper.isActive((DimensionType) (Object) this)) {
17-
return SpectrumClient.skyLerper.tickLerp(time, MinecraftClient.getInstance().getTickDelta());
17+
return SpectrumClient.skyLerper.tickLerp(time, MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false));
1818
} else {
1919
return time;
2020
}

src/main/java/de/dafuqs/spectrum/mixin/client/DrawContextMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class DrawContextMixin {
3030
return;
3131

3232
var player = MinecraftClient.getInstance().player;
33-
var tickDelta = MinecraftClient.getInstance().getTickDelta();
33+
var tickDelta = MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false);
3434

3535
var type = backgroundEffectProvider.backgroundType(player, stack);
3636
var opacity = backgroundEffectProvider.getEffectOpacity(player, stack, tickDelta);

src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public static void registerS2CReceivers() {
154154

155155
client.execute(() -> {
156156
// Everything in this lambda is running on the render thread
157-
SpectrumClient.skyLerper.trigger(dimensionType, sourceTime, client.getTickDelta(), targetTime);
157+
SpectrumClient.skyLerper.trigger(dimensionType, sourceTime, client.getRenderTickCounter().getTickDelta(false), targetTime);
158158
if (client.world.isSkyVisible(client.player.getBlockPos())) {
159159
client.world.playSound(null, client.player.getBlockPos(), SpectrumSoundEvents.CELESTIAL_POCKET_WATCH_FLY_BY, SoundCategory.NEUTRAL, 0.15F, 1.0F);
160160
}

src/main/java/de/dafuqs/spectrum/particle/client/LightTrailparticle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected LightTrailparticle(ClientWorld world, double x, double y, double z, d
2323
@Override
2424
public void tick() {
2525
super.tick();
26-
var fadeProgress = MathHelper.clamp((age + MinecraftClient.getInstance().getTickDelta()) / maxAge, 0, 1);
26+
var fadeProgress = MathHelper.clamp((age + MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false)) / maxAge, 0, 1);
2727
setAlpha(MathHelper.lerp(fadeProgress, 0.8F, 0F));
2828
scale = MathHelper.lerp(fadeProgress, 0.2F, 0.1F);
2929
}

0 commit comments

Comments
 (0)