From 11b74245109d6f0a1a5601f02b668d572eeab14b Mon Sep 17 00:00:00 2001
From: IMS212 <ims@irisshaders.dev>
Date: Wed, 15 May 2024 09:08:02 -0700
Subject: [PATCH] Port to 24w20a

---
 build.gradle.kts                              |  8 ++--
 .../mixin/MixinLevelRenderer.java             | 13 ++++---
 src/main/java/net/irisshaders/iris/Iris.java  |  2 +-
 .../iris/mixin/MixinGameRenderer.java         | 10 +++--
 .../iris/mixin/MixinLevelRenderer.java        | 38 +++++++++----------
 .../iris/mixin/MixinModelViewBobbing.java     | 11 +++++-
 .../mixin/fantastic/MixinLevelRenderer.java   |  7 +++-
 .../irisshaders/iris/mixin/gui/MixinGui.java  |  3 +-
 .../mixin/gui/MixinVideoSettingsScreen.java   |  4 +-
 .../statelisteners/MixinRenderSystem.java     |  4 +-
 .../immediate/MixinLevelRenderer.java         |  5 ++-
 .../iris/uniforms/IrisExclusiveUniforms.java  |  2 +-
 src/main/resources/fabric.mod.json            | 10 +----
 13 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d1cb3622ca..aca0ebd951 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,15 +3,15 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
 object Constants {
     // https://fabricmc.net/develop/
-    const val MINECRAFT_VERSION: String = "1.20.5"
-    const val FABRIC_LOADER_VERSION: String = "0.15.10"
+    const val MINECRAFT_VERSION: String = "24w20a"
+    const val FABRIC_LOADER_VERSION: String = "0.15.11"
     const val FABRIC_API_VERSION: String = "0.97.5+1.20.5"
 
     // https://semver.org/
     const val MOD_VERSION: String = "1.7.0"
 
-    const val CUSTOM_SODIUM: Boolean = false
-    const val CUSTOM_SODIUM_NAME: String = "sodium-fabric-0.5.8-snapshot+mc24w14a-local.jar"
+    const val CUSTOM_SODIUM: Boolean = true
+    const val CUSTOM_SODIUM_NAME: String = "sodium-fabric-0.5.8-snapshotmc24w20a-local.jar"
 
     const val IS_SHARED_BETA: Boolean = false
     const val ACTIVATE_RENDERDOC: Boolean = false
diff --git a/src/main/java/net/irisshaders/batchedentityrendering/mixin/MixinLevelRenderer.java b/src/main/java/net/irisshaders/batchedentityrendering/mixin/MixinLevelRenderer.java
index e2719a4a66..e72d31bad0 100644
--- a/src/main/java/net/irisshaders/batchedentityrendering/mixin/MixinLevelRenderer.java
+++ b/src/main/java/net/irisshaders/batchedentityrendering/mixin/MixinLevelRenderer.java
@@ -8,6 +8,7 @@
 import net.irisshaders.batchedentityrendering.impl.TransparencyType;
 import net.irisshaders.iris.shaderpack.materialmap.WorldRenderingSettings;
 import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
@@ -40,7 +41,7 @@ public class MixinLevelRenderer {
 	private Groupable groupable;
 
 	@Inject(method = "renderLevel", at = @At("HEAD"))
-	private void batchedentityrendering$beginLevelRender(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void batchedentityrendering$beginLevelRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		if (renderBuffers instanceof DrawCallTrackingRenderBuffers) {
 			((DrawCallTrackingRenderBuffers) renderBuffers).resetDrawCounts();
 		}
@@ -54,21 +55,21 @@ public class MixinLevelRenderer {
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = RENDER_ENTITY))
-	private void batchedentityrendering$preRenderEntity(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void batchedentityrendering$preRenderEntity(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		if (groupable != null) {
 			groupable.startGroup();
 		}
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = RENDER_ENTITY, shift = At.Shift.AFTER))
-	private void batchedentityrendering$postRenderEntity(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void batchedentityrendering$postRenderEntity(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		if (groupable != null) {
 			groupable.endGroup();
 		}
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "CONSTANT", args = "stringValue=translucent"), locals = LocalCapture.CAPTURE_FAILHARD)
-	private void batchedentityrendering$beginTranslucents(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void batchedentityrendering$beginTranslucents(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		if (renderBuffers.bufferSource() instanceof FullyBufferedMultiBufferSource fullyBufferedMultiBufferSource) {
 			fullyBufferedMultiBufferSource.readyUp();
 		}
@@ -89,14 +90,14 @@ public class MixinLevelRenderer {
 
 
 	@Inject(method = "renderLevel", at = @At(value = "CONSTANT", args = "stringValue=translucent", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD)
-	private void batchedentityrendering$endTranslucents(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void batchedentityrendering$endTranslucents(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		if (WorldRenderingSettings.INSTANCE.shouldSeparateEntityDraws()) {
 			this.renderBuffers.bufferSource().endBatch();
 		}
 	}
 
 	@Inject(method = "renderLevel", at = @At("RETURN"))
-	private void batchedentityrendering$endLevelRender(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void batchedentityrendering$endLevelRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		((RenderBuffersExt) renderBuffers).endLevelRendering();
 		groupable = null;
 	}
diff --git a/src/main/java/net/irisshaders/iris/Iris.java b/src/main/java/net/irisshaders/iris/Iris.java
index a384d436f8..da6a57047f 100644
--- a/src/main/java/net/irisshaders/iris/Iris.java
+++ b/src/main/java/net/irisshaders/iris/Iris.java
@@ -98,7 +98,7 @@ public class Iris {
 
 	static {
 		if (!BuildConfig.ACTIVATE_RENDERDOC && FabricLoader.getInstance().isDevelopmentEnvironment() && System.getProperty("user.name").contains("ims") && Util.getPlatform() == Util.OS.LINUX) {
-			Configuration.GLFW_LIBRARY_NAME.set("/usr/lib/libglfw.so");
+			//Configuration.GLFW_LIBRARY_NAME.set("/usr/lib/libglfw.so");
 		}
 	}
 
diff --git a/src/main/java/net/irisshaders/iris/mixin/MixinGameRenderer.java b/src/main/java/net/irisshaders/iris/mixin/MixinGameRenderer.java
index 526d7182b8..f2506c34ae 100644
--- a/src/main/java/net/irisshaders/iris/mixin/MixinGameRenderer.java
+++ b/src/main/java/net/irisshaders/iris/mixin/MixinGameRenderer.java
@@ -16,6 +16,8 @@
 import net.irisshaders.iris.api.v0.IrisApi;
 import net.irisshaders.iris.uniforms.CapturedRenderingState;
 import net.irisshaders.iris.uniforms.SystemTimeUniforms;
+import net.minecraft.Util;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.GameRenderer;
@@ -328,11 +330,11 @@ public class MixinGameRenderer {
 	}
 
 	@Inject(method = "render", at = @At("HEAD"))
-	private void iris$startFrame(float tickDelta, long startTime, boolean pBoolean2, CallbackInfo ci) {
+	private void iris$startFrame(DeltaTracker deltaTracker, boolean bl, CallbackInfo ci) {
 		// This allows certain functions like float smoothing to function outside a world.
-		CapturedRenderingState.INSTANCE.setRealTickDelta(tickDelta);
+		CapturedRenderingState.INSTANCE.setRealTickDelta(deltaTracker.getGameTimeDeltaPartialTick(true));
 		SystemTimeUniforms.COUNTER.beginFrame();
-		SystemTimeUniforms.TIMER.beginFrame(startTime);
+		SystemTimeUniforms.TIMER.beginFrame(Util.getNanos());
 	}
 
 	@Inject(method = {
@@ -469,7 +471,7 @@ private static void override(ShaderKey key, CallbackInfoReturnable<ShaderInstanc
 	}
 
 	@Inject(method = "renderLevel", at = @At("TAIL"))
-	private void iris$runColorSpace(float f, long l, CallbackInfo ci) {
+	private void iris$runColorSpace(DeltaTracker deltaTracker, CallbackInfo ci) {
 		Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::finalizeGameRendering);
 	}
 
diff --git a/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer.java b/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer.java
index eac011aeba..2325c2ee9d 100644
--- a/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer.java
+++ b/src/main/java/net/irisshaders/iris/mixin/MixinLevelRenderer.java
@@ -18,6 +18,7 @@
 import net.irisshaders.iris.uniforms.SystemTimeUniforms;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.GameRenderer;
@@ -74,7 +75,7 @@ public class MixinLevelRenderer {
 	// This is important or else very odd issues will happen with shaders that have a final pass that doesn't write to
 	// all pixels.
 	@Inject(method = "renderLevel", at = @At("HEAD"))
-	private void iris$setupPipeline(float tickDelta, long startTime, boolean renderBlockOutline,
+	private void iris$setupPipeline(DeltaTracker deltaTracker, boolean renderBlockOutline,
 									Camera camera, GameRenderer gameRenderer, LightTexture lightTexture,
 									Matrix4f modelView, Matrix4f projection, CallbackInfo callback) {
 		DHCompat.checkFrame();
@@ -82,8 +83,7 @@ public class MixinLevelRenderer {
 		IrisTimeUniforms.updateTime();
 		CapturedRenderingState.INSTANCE.setGbufferModelView(modelView);
 		CapturedRenderingState.INSTANCE.setGbufferProjection(projection);
-		TickRateManager lvTickRateManager10 = this.minecraft.level.tickRateManager();
-		float fakeTickDelta = lvTickRateManager10.runsNormally() ? tickDelta : 1.0F;
+		float fakeTickDelta = deltaTracker.getGameTimeDeltaPartialTick(false);
 		CapturedRenderingState.INSTANCE.setTickDelta(fakeTickDelta);
 		CapturedRenderingState.INSTANCE.setCloudTime((ticks + fakeTickDelta) * 0.03F);
 
@@ -105,7 +105,7 @@ public class MixinLevelRenderer {
 	// This is important or else very odd issues will happen with shaders that have a final pass that doesn't write to
 	// all pixels.
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = CLEAR, shift = At.Shift.AFTER, remap = false))
-	private void iris$beginLevelRender(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$beginLevelRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.beginLevelRendering();
 		pipeline.setPhase(WorldRenderingPhase.NONE);
 	}
@@ -114,8 +114,8 @@ public class MixinLevelRenderer {
 	// Inject a bit early so that we can end our rendering before mods like VoxelMap (which inject at RETURN)
 	// render their waypoint beams.
 	@Inject(method = "renderLevel", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
-	private void iris$endLevelRender(float tickDelta, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f modelMatrix, Matrix4f matrix4f2, CallbackInfo ci) {
-		HandRenderer.INSTANCE.renderTranslucent(modelMatrix, tickDelta, camera, gameRenderer, pipeline);
+	private void iris$endLevelRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f modelMatrix, Matrix4f matrix4f2, CallbackInfo ci) {
+		HandRenderer.INSTANCE.renderTranslucent(modelMatrix, deltaTracker.getGameTimeDeltaPartialTick(true), camera, gameRenderer, pipeline);
 		Minecraft.getInstance().getProfiler().popPush("iris_final");
 		pipeline.finalizeLevelRendering();
 		pipeline = null;
@@ -136,7 +136,7 @@ public class MixinLevelRenderer {
 
 	// Do this before sky rendering so it's ready before the sky render starts.
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderSky(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/client/Camera;ZLjava/lang/Runnable;)V"))
-	private void iris$renderTerrainShadows(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$renderTerrainShadows(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.renderShadows((LevelRendererAccessor) this, camera);
 	}
 
@@ -146,7 +146,7 @@ public class MixinLevelRenderer {
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderSky(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/client/Camera;ZLjava/lang/Runnable;)V"))
-	private void iris$beginSky(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$beginSky(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		// Use CUSTOM_SKY until levelFogColor is called as a heuristic to catch FabricSkyboxes.
 		pipeline.setPhase(WorldRenderingPhase.CUSTOM_SKY);
 
@@ -196,17 +196,17 @@ public class MixinLevelRenderer {
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderSky(Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/client/Camera;ZLjava/lang/Runnable;)V", shift = At.Shift.AFTER))
-	private void iris$endSky(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$endSky(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.NONE);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderClouds(Lcom/mojang/blaze3d/vertex/PoseStack;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V"))
-	private void iris$beginClouds(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$beginClouds(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.CLOUDS);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderClouds(Lcom/mojang/blaze3d/vertex/PoseStack;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V", shift = At.Shift.AFTER))
-	private void iris$endClouds(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$endClouds(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.NONE);
 	}
 
@@ -222,7 +222,7 @@ public class MixinLevelRenderer {
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = RENDER_WEATHER))
-	private void iris$beginWeather(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$beginWeather(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.RAIN_SNOW);
 	}
 
@@ -236,27 +236,27 @@ public class MixinLevelRenderer {
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = RENDER_WEATHER, shift = At.Shift.AFTER))
-	private void iris$endWeather(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$endWeather(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.NONE);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderWorldBorder(Lnet/minecraft/client/Camera;)V"))
-	private void iris$beginWorldBorder(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$beginWorldBorder(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.WORLD_BORDER);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderWorldBorder(Lnet/minecraft/client/Camera;)V", shift = At.Shift.AFTER))
-	private void iris$endWorldBorder(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$endWorldBorder(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.NONE);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/debug/DebugRenderer;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V"))
-	private void iris$setDebugRenderStage(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$setDebugRenderStage(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.DEBUG);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/debug/DebugRenderer;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V", shift = At.Shift.AFTER))
-	private void iris$resetDebugRenderStage(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$resetDebugRenderStage(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.setPhase(WorldRenderingPhase.NONE);
 	}
 
@@ -271,9 +271,9 @@ public class MixinLevelRenderer {
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "CONSTANT", args = "stringValue=translucent"))
-	private void iris$beginTranslucents(float tickDelta, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f modelMatrix, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$beginTranslucents(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f modelMatrix, Matrix4f matrix4f2, CallbackInfo ci) {
 		pipeline.beginHand();
-		HandRenderer.INSTANCE.renderSolid(modelMatrix, tickDelta, camera, gameRenderer, pipeline);
+		HandRenderer.INSTANCE.renderSolid(modelMatrix, deltaTracker.getGameTimeDeltaPartialTick(true), camera, gameRenderer, pipeline);
 		Minecraft.getInstance().getProfiler().popPush("iris_pre_translucent");
 		pipeline.beginTranslucents();
 	}
diff --git a/src/main/java/net/irisshaders/iris/mixin/MixinModelViewBobbing.java b/src/main/java/net/irisshaders/iris/mixin/MixinModelViewBobbing.java
index 80de1d4fa1..bcfb29575b 100644
--- a/src/main/java/net/irisshaders/iris/mixin/MixinModelViewBobbing.java
+++ b/src/main/java/net/irisshaders/iris/mixin/MixinModelViewBobbing.java
@@ -1,6 +1,8 @@
 package net.irisshaders.iris.mixin;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import org.joml.Matrix4f;
 import net.irisshaders.iris.api.v0.IrisApi;
@@ -35,6 +37,9 @@ public abstract class MixinModelViewBobbing {
 	@Shadow
 	@Final
 	private Minecraft minecraft;
+	@Shadow
+	@Final
+	private Camera mainCamera;
 	@Unique
 	private Matrix4fc bobbingEffectsModel;
 
@@ -42,7 +47,7 @@ public abstract class MixinModelViewBobbing {
 	private boolean areShadersOn;
 
 	@Inject(method = "renderLevel", at = @At("HEAD"))
-	private void iris$saveShadersOn(float pGameRenderer0, long pLong1, CallbackInfo ci) {
+	private void iris$saveShadersOn(DeltaTracker deltaTracker, CallbackInfo ci) {
 		areShadersOn = IrisApi.getInstance().isShaderPackInUse();
 	}
 
@@ -76,7 +81,7 @@ public abstract class MixinModelViewBobbing {
 	@Redirect(method = "renderLevel",
 		at = @At(value = "INVOKE",
 			target = "Lorg/joml/Matrix4f;rotationXYZ(FFF)Lorg/joml/Matrix4f;"))
-	private Matrix4f iris$applyBobbingToModelView(Matrix4f instance, float angleX, float angleY, float angleZ, float tickDelta) {
+	private Matrix4f iris$applyBobbingToModelView(Matrix4f instance, float angleX, float angleY, float angleZ) {
 		if (!areShadersOn) {
 			instance.rotateXYZ(angleX, angleY, angleZ);
 
@@ -86,6 +91,8 @@ public abstract class MixinModelViewBobbing {
 		PoseStack stack = new PoseStack();
 		stack.last().pose().set(instance);
 
+		float tickDelta = this.mainCamera.getPartialTickTime();
+
 		this.bobHurt(stack, tickDelta);
 		if (this.minecraft.options.bobView().get()) {
 			this.bobView(stack, tickDelta);
diff --git a/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinLevelRenderer.java b/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinLevelRenderer.java
index 78aac2c6ab..75ead24910 100644
--- a/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinLevelRenderer.java
+++ b/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinLevelRenderer.java
@@ -8,6 +8,7 @@
 import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
 import net.irisshaders.iris.shaderpack.properties.ParticleRenderingSettings;
 import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.ParticleEngine;
 import net.minecraft.client.renderer.GameRenderer;
@@ -41,16 +42,18 @@ public class MixinLevelRenderer {
 	private RenderBuffers renderBuffers;
 
 	@Inject(method = "renderLevel", at = @At("HEAD"))
-	private void iris$resetParticleManagerPhase(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$resetParticleManagerPhase(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		((PhasedParticleEngine) minecraft.particleEngine).setParticleRenderingPhase(ParticleRenderingPhase.EVERYTHING);
 	}
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;entitiesForRendering()Ljava/lang/Iterable;"))
-	private void iris$renderOpaqueParticles(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$renderOpaqueParticles(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		minecraft.getProfiler().popPush("opaque_particles");
 
 		ParticleRenderingSettings settings = getRenderingSettings();
 
+		float f = deltaTracker.getGameTimeDeltaPartialTick(false);
+
 		if (settings == ParticleRenderingSettings.BEFORE) {
 			minecraft.particleEngine.render(lightTexture, camera, f);
 		} else if (settings == ParticleRenderingSettings.MIXED) {
diff --git a/src/main/java/net/irisshaders/iris/mixin/gui/MixinGui.java b/src/main/java/net/irisshaders/iris/mixin/gui/MixinGui.java
index 1075474132..f6b0373af8 100644
--- a/src/main/java/net/irisshaders/iris/mixin/gui/MixinGui.java
+++ b/src/main/java/net/irisshaders/iris/mixin/gui/MixinGui.java
@@ -4,6 +4,7 @@
 import net.irisshaders.iris.Iris;
 import net.irisshaders.iris.gui.screen.HudHideable;
 import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphics;
@@ -28,7 +29,7 @@ public class MixinGui {
 	private DebugScreenOverlay debugOverlay;
 
 	@Inject(method = "render", at = @At("HEAD"), cancellable = true)
-	public void iris$handleHudHidingScreens(GuiGraphics pGui0, float pFloat1, CallbackInfo ci) {
+	public void iris$handleHudHidingScreens(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) {
 		Screen screen = this.minecraft.screen;
 
 		if (screen instanceof HudHideable) {
diff --git a/src/main/java/net/irisshaders/iris/mixin/gui/MixinVideoSettingsScreen.java b/src/main/java/net/irisshaders/iris/mixin/gui/MixinVideoSettingsScreen.java
index 41e26971d8..704b827424 100644
--- a/src/main/java/net/irisshaders/iris/mixin/gui/MixinVideoSettingsScreen.java
+++ b/src/main/java/net/irisshaders/iris/mixin/gui/MixinVideoSettingsScreen.java
@@ -4,7 +4,7 @@
 import net.irisshaders.iris.gui.screen.ShaderPackScreen;
 import net.minecraft.client.OptionInstance;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.VideoSettingsScreen;
+import net.minecraft.client.gui.screens.options.VideoSettingsScreen;
 import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,7 +17,7 @@ protected MixinVideoSettingsScreen(Component title) {
 	}
 
 	@ModifyArg(
-		method = "init",
+		method = "addOptions",
 		at = @At(
 			value = "INVOKE",
 			target = "Lnet/minecraft/client/gui/components/OptionsList;addSmall([Lnet/minecraft/client/OptionInstance;)V"
diff --git a/src/main/java/net/irisshaders/iris/mixin/statelisteners/MixinRenderSystem.java b/src/main/java/net/irisshaders/iris/mixin/statelisteners/MixinRenderSystem.java
index 42cd8eaea6..39881e1f73 100644
--- a/src/main/java/net/irisshaders/iris/mixin/statelisteners/MixinRenderSystem.java
+++ b/src/main/java/net/irisshaders/iris/mixin/statelisteners/MixinRenderSystem.java
@@ -17,14 +17,14 @@ public class MixinRenderSystem {
 		StateUpdateNotifiers.fogEndNotifier = listener -> fogEndListener = listener;
 	}
 
-	@Inject(method = "_setShaderFogStart", at = @At(value = "FIELD", target = "Lcom/mojang/blaze3d/systems/RenderSystem;shaderFogStart:F", shift = At.Shift.AFTER))
+	@Inject(method = "setShaderFogStart", at = @At(value = "FIELD", target = "Lcom/mojang/blaze3d/systems/RenderSystem;shaderFogStart:F", shift = At.Shift.AFTER))
 	private static void iris$onFogStart(float start, CallbackInfo ci) {
 		if (fogStartListener != null) {
 			fogStartListener.run();
 		}
 	}
 
-	@Inject(method = "_setShaderFogEnd", at = @At(value = "FIELD", target = "Lcom/mojang/blaze3d/systems/RenderSystem;shaderFogEnd:F", shift = At.Shift.AFTER))
+	@Inject(method = "setShaderFogEnd", at = @At(value = "FIELD", target = "Lcom/mojang/blaze3d/systems/RenderSystem;shaderFogEnd:F", shift = At.Shift.AFTER))
 	private static void iris$onFogEnd(float end, CallbackInfo ci) {
 		if (fogEndListener != null) {
 			fogEndListener.run();
diff --git a/src/main/java/net/irisshaders/iris/mixin/vertices/immediate/MixinLevelRenderer.java b/src/main/java/net/irisshaders/iris/mixin/vertices/immediate/MixinLevelRenderer.java
index ffaa0f1ea9..4c9e73919a 100644
--- a/src/main/java/net/irisshaders/iris/mixin/vertices/immediate/MixinLevelRenderer.java
+++ b/src/main/java/net/irisshaders/iris/mixin/vertices/immediate/MixinLevelRenderer.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.irisshaders.iris.vertices.ImmediateState;
 import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
@@ -16,12 +17,12 @@
 @Mixin(value = LevelRenderer.class, priority = 999)
 public class MixinLevelRenderer {
 	@Inject(method = "renderLevel", at = @At("HEAD"))
-	private void iris$immediateStateBeginLevelRender(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$immediateStateBeginLevelRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		ImmediateState.isRenderingLevel = true;
 	}
 
 	@Inject(method = "renderLevel", at = @At("RETURN"))
-	private void iris$immediateStateEndLevelRender(float f, long l, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
+	private void iris$immediateStateEndLevelRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
 		ImmediateState.isRenderingLevel = false;
 	}
 }
diff --git a/src/main/java/net/irisshaders/iris/uniforms/IrisExclusiveUniforms.java b/src/main/java/net/irisshaders/iris/uniforms/IrisExclusiveUniforms.java
index 43f294b57f..5caf89ce0d 100644
--- a/src/main/java/net/irisshaders/iris/uniforms/IrisExclusiveUniforms.java
+++ b/src/main/java/net/irisshaders/iris/uniforms/IrisExclusiveUniforms.java
@@ -64,7 +64,7 @@ public static void addIrisExclusiveUniforms(UniformHolder uniforms) {
 			if (Minecraft.getInstance().level != null) {
 				return StreamSupport.stream(Minecraft.getInstance().level.entitiesForRendering().spliterator(), false).filter(bolt -> bolt instanceof LightningBolt).findAny().map(bolt -> {
 					Vector3d unshiftedCameraPosition = CameraUniforms.getUnshiftedCameraPosition();
-					Vec3 vec3 = bolt.getPosition(Minecraft.getInstance().getDeltaFrameTime());
+					Vec3 vec3 = bolt.getPosition(Minecraft.getInstance().getTimer().getGameTimeDeltaPartialTick(true));
 					return new Vector4f((float) (vec3.x - unshiftedCameraPosition.x), (float) (vec3.y - unshiftedCameraPosition.y), (float) (vec3.z - unshiftedCameraPosition.z), 1);
 				}).orElse(zero);
 			} else {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index c760f74eda..5f86880203 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,15 +36,7 @@
   ],
   "accessWidener": "iris.accesswidener",
   "depends": {
-    "fabricloader": ">=0.12.3",
-    "minecraft": [
-      "1.20.5",
-      "1.20.6"
-    ],
-    "sodium": [
-      "0.5.8",
-      "0.5.9"
-    ]
+    "fabricloader": ">=0.12.3"
   },
   "breaks": {
     "iris-explorer": "*",